@ozdao/prometheus-framework 0.2.95 → 0.2.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.95",
+  "version": "0.2.96",
   "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/components/Completion/Completion.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="w-100 radius-big pd-medium bg-main t-black">
+  <section class="w-100 radius-big pd-medium bg-second t-black">
     <div class="mn-b-thin flex-v-center flex-nowrap flex">    
       <h3>
         {{text}}
@@ -22,7 +22,7 @@
     </div> 
 
     <div class=" w-100 h-2r pos-relative pd-nano bg-black radius-big">
-      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-main mn-b-thin radius-big">
+      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-second mn-b-thin radius-big">
       </div>
     </div>
    

package/src/modules/globals/services/globals.crud.js

@@ -60,7 +60,9 @@ class CRUD {
         ),
         globalsQuery.removeTempPropeties()
       ];
+      
       const cacheKey = JSON.stringify({ stages });
+
       let data = await this.cache.get(cacheKey);
 
       if (!data) {

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

@@ -115,7 +115,7 @@
         :photo="orders.state.current.customer.profile.photo"
         :name="orders.state.current.customer.profile.name || orders.state.current.customer.phone || orders.state.current.customer.email"
         @click="() => { 
-         orders.mutations.resetCustomer(orders.state.current.customer)
+          orders.mutations.resetCustomer(orders.state.current.customer)
         }"
         class="bg-white pd-thin radius-medium w-100 mn-b-thin"
       />

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

@@ -80,7 +80,8 @@ const controllerFactory = (db) => {
   // Создание заказа
   const create = async (req, res) => {
     const orderData = req.body;
-    const userId = req.userId;
+    
+    const userId = req.userId || req.body.creator.target;
 
     orderData.status = 'created';
 
@@ -185,7 +186,7 @@ const controllerFactory = (db) => {
       // Добавление записи в историю изменений статусов
       order.status_history.push({
         status: req.body.status,
-        user: new db.mongoose.Types.ObjectId(req.userId), 
+        user: new db.mongoose.Types.ObjectId(req.userId || req.body.creator.target), 
         timestamp: new Date(),
         comment: ''
       });

package/src/modules/orders/routes/orders.routes.js

@@ -9,9 +9,9 @@ module.exports = function(app, db, origins, publicPath) {
 
   app.post(
     "/api/orders/create",
-    [
-      middleware.authJwt.verifyToken
-    ],
+    // [
+    //   middleware.authJwt.verifyToken
+    // ],
     controller.create
   );
   
@@ -22,17 +22,17 @@ module.exports = function(app, db, origins, publicPath) {
 
   app.post(
     "/api/orders/update",
-    [
-      middleware.authJwt.verifyToken
-    ],
+    // [
+    //   middleware.authJwt.verifyToken
+    // ],
     controller.update
   );
   
   app.post(
     "/api/orders/delete",
-    [
-      middleware.authJwt.verifyToken
-    ],
+    // [
+    //   middleware.authJwt.verifyToken
+    // ],
     controller.deleteOrder
   );
 };

package/src/modules/orders/store/customers.store.js

@@ -1,5 +1,5 @@
 import Store from '@pf/src/modules/globals/services/globals.store.js'
 
-const customers = new Store('/api/customers')
+const customers = new Store(`${process.env.API_URL}/api/customers`)
 
 export default customers

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

@@ -12,7 +12,8 @@
 	      			i-big 
 	      			hover-scale-1
 	      			cursor-pointer
-	      			t-whitebg-second
+	      			t-white
+	      			bg-second
 	      		">
 	      			+
 	      	</button>

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

@@ -371,10 +371,11 @@ const create = async (req, res) => {
     const savedOrganization = await organization.save();
 
     const membership = new Membership({
-        user: savedOrganization.owner,
-        type: 'organization',
-        target: savedOrganization._id,
-        role: 'owner',
+      user: savedOrganization.owner,
+      type: 'organization',
+      target: savedOrganization._id,
+      role: 'owner',
+      label: 'owner',
     });
     
     const savedMembership = await membership.save();

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

@@ -7,7 +7,7 @@
 	      		@click="$router.push({
 	      			name: 'Create BlogPost'
 	      		})" 
-	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
+	      		class="radius-100 t-white t-semi i-big hover-scale-1 cursor-pointer t-white bg-second">
 	      			+
 	      	</button>
 		</header>

package/src/modules/users/components/sections/ProfileCompletion.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="w-100 mn-b-semi radius-medium pd-medium bg-main t-black">
+  <section class="w-100 mn-b-semi radius-medium pd-medium bg-second t-black">
     <div class="mn-b-thin flex-v-center flex-nowrap flex">    
       <h4>
         {{text}}
@@ -22,7 +22,7 @@
     </div> 
 
     <div class=" w-100 h-2r pos-relative pd-nano bg-black radius-big">
-      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-main mn-b-thin radius-big">
+      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-second mn-b-thin radius-big">
       </div>
     </div>
    

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

@@ -1,97 +0,0 @@
-<template>
-	<div class="pd-thin">
-		<header class="mn-b-medium flex-v-center flex-nowrap flex">
-	      	<h2 class="mn-r-medium">Groups</h2>
-	      	<button 
-	      		v-if="auth.state.user._id === route.params._id"
-	      		@click="$router.push({
-	      			name: 'Create Organization'
-	      		})" 
-	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-	      			+
-	      	</button>
-		</header>
-
-		<Tab 
-			v-model:selected="tabOrganization"
-			:tabs="[
-				{ name: 'Member', 	value: 'member' },
-				{ name: 'Follower', value: 'follower' }		
-			]"
-			class="mn-b-medium mn-r-medium o-hidden h5 radius-big bg-grey"
-		/>
-
-		<transition name="slide-fade">
-			<Feed
-				v-if="tabOrganization === 'member'"
-	      :states="{
-	        empty: {
-	          title: 'No Organization Found',
-	          description: 'Currently, there are no organization available.'
-	        }
-	      }"
-	      :store="{
-	        read: (options) => organizations.actions.read(options),
-	        state: organizations.state
-	      }"
-	      :options="{
-	        	user: auth.state.user._id,
-	        	member: auth.state.user._id,
-						limit: 10
-	      }"
-	      v-slot="{ 
-	        items 
-	      }"
-	    >
-	    	<CardOrganization 
-    			v-for="organization in items"
-        	:key="organization._id" 
-	      	:organization="organization"
-	      	:user="auth.state.user"
-	      	:showProducts="false"
-	      	:showRating="false"
-	      	:showFeatured="false"
-	      	:showFollowers="false"
-					@updateMembership="handleMembershipUpdate"
-					class="mn-b-thin w-100 pd-0 bg-white radius-big o-hidden"
-		    />
-	    </Feed>
-		</transition>
-
-		<!-- <transition name="slide-fade">
-			<Feed 
-				v-if="tabOrganization === 'follower'"
-		  		:user="auth.state.user._id"
-		  		:subscriber="route.params._id"
-			/>
-		</transition> -->
-	</div>
-</template>
-
-<script setup>
-	import { watch, ref } from 'vue'
-	import { useRoute, useRouter } from 'vue-router'
-	// Components
-	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	import Feed from '@pf/src/components/Feed/Feed.vue'
-	
-	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
-	
-	// import Feed from '@pf/src/modules/organizations/components/sections/Feed.vue'; 
-
-	import * as auth from '@pf/src/modules/auth/store/auth';
-	import * as organizations from '@pf/src/modules/organizations/store/organizations'
-	// Accessing router
-	const route = useRoute()
-	const router = useRouter()
-	// State
-	let tab = route.query.tab ? route.query.tab : 'member';
-
-	const tabOrganization = ref(tab)
-
-	route.query.tab = tabOrganization.value
-
-	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: { ...route.query, tab: newValue } });
-	});
-</script>