@ozdao/prometheus-framework 0.2.309 → 0.2.310

package/dist/prometheus-framework/src/modules/wallet/views/components/pages/Wallet.vue.js

@@ -4,16 +4,16 @@ import Web3 from "web3";
 import { state, actions } from "../../store/wallet.store.js";
 import text from "../../localization/wallet.json.js";
 import _sfc_main$3 from "../../../../../components/Popup/Popup.vue.js";
-import _sfc_main$1 from "../../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../../components/Button/Button.vue.js";
 import "vue-router";
 /* empty css                                            */
-/* empty css                                               */
+/* empty css                                              */
 /* empty css                                           */
 import "../../../../reports/store/reports.js";
 import "../../../../auth/views/store/auth.js";
 import "../../../../organizations/store/memberships.js";
 import "../../../../community/store/reactions.js";
-/* empty css                                         */
+/* empty css                                        */
 import _sfc_main$2 from "../elements/ConnectMetamask.vue.js";
 import _sfc_main$4 from "../blocks/CashDeposit.vue.js";
 import _sfc_main$5 from "../blocks/CardDeposit.vue.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.309",
+  "version": "0.2.310",
   "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/Block/Block.vue

@@ -1,6 +1,6 @@
 <template>
 	<div 
-    class="bg-light pd-medium radius-big"
+    class="bg-light pd-medium radius-medium"
   >
   	<div v-if="title || actions" class="mn-b-small flex-v-center flex-nowrap flex">
   		<h4 v-if="title" class="mn-r-thin t-medium">{{title}}</h4>

package/src/components/EditImages/EditImages.vue

@@ -32,7 +32,7 @@
       :uploadPath="props.uploadPath"
       :text="props.text"
       :options="props.options"
-      class="w-100 pd-extra"
+      class="w-100 pd-medium"
     />
 	</div>	
 </template>

package/src/modules/auth/views/middlewares/auth.validation.js

@@ -4,6 +4,7 @@ function resetUser(to, from, next) {
   next()
   auth.state.user.phone = ''
   auth.state.user.email = ''
+  auth.state.user.avatar = ''
   auth.state.user.password = ''
   auth.state.user.passwordRepeat = ''
 }

package/src/modules/auth/views/store/auth.js

@@ -19,6 +19,7 @@
   const state = reactive({
     user: {
       _id: undefined,
+      avatar: null,
       username: '',
       email: '',
       phone: '',
@@ -40,7 +41,7 @@
         const userCookie = cookie ? cookie : await getCookie('user');
 
         if (userCookie) {
-          const { _id, email, phone, roles, accessToken } = userCookie;
+          const { _id, email, phone, avatar, roles, accessToken } = userCookie;
 
           setAuthToken(accessToken);
 
@@ -50,7 +51,7 @@
           state.accesses = userAccesses;
 
           // Обновление состояния приложения с информацией о пользователе и его правах доступа
-          Object.assign(state.user, { _id, email, phone });
+          Object.assign(state.user, { _id, email, phone, avatar });
           Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
         } else {
           console.log('no cookies')
@@ -58,6 +59,7 @@
           state.accesses = [];
           state.user = {
             _id: undefined,
+            avatar: null,
             username: '',
             email: '',
             phone: '',
@@ -77,6 +79,7 @@
         state.user = {
           _id: undefined,
           username: '',
+          avatar: null,
           email: '',
           phone: '',
           password: '',
@@ -185,6 +188,7 @@
       Object.assign(state.user, {
         _id: undefined,
         username: '',
+        avatar: null,
         email: '',
         phone: '',
         password: '',

package/src/modules/backoffice/components/pages/Dashboard.vue

@@ -1,7 +1,5 @@
 <template>
-	<div class="">
-		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
-		
+	<div class="bg-white">
 		
 	</div>
 </template>

package/src/modules/globals/views/components/partials/BottomNavigationBar.vue

@@ -18,7 +18,7 @@
           <router-link 
             class="no-hover-color t-center t-medium"
             :class="{ 't-second': $route.path === '/catalog', 't-transp': $route.path !== '/catalog' }"
-            to="/catalog"
+            to="/marketplace"
           >
             <IconCatalog 
               class="mn-r-auto mn-l-auto i-big mn-b-thin"

package/src/modules/globals/views/components/partials/NavigationBar.vue

@@ -19,10 +19,10 @@
     <transition-group name="slideIn" class="pos-absolute i-semi pos-r-medium" tag="div">
       <template v-for="(item, index) in actions" :key="index">
         <component
-					v-if="typeof item.condition === 'function' ? item.condition() : item.condition"
+					v-if="typeof item.condition === 'function' ? item.condition(router, route) : item.condition"
           :is="item.component"
           v-bind="item.props"
-          @click="item.action(router)"
+          @click="item.action(router, route)"
           class="i-semi cursor-pointer "
         />
       </template>
@@ -103,7 +103,7 @@
 
 	const { t, mergeLocaleMessage, locale } = useI18n();
 
-	const actions = computed(() => route.meta?.actions || [])
+	const actions = computed(() => globals.state.navigation_bar.actions || route.meta?.actions || [])
 
 	function handleBackNavigation() {
 	    if (route.query?.afterAuth)  { 

package/src/modules/globals/views/store/globals.js

@@ -18,6 +18,11 @@ const state = reactive({
     darkmode: false
   },
 
+  navigation_bar: {
+    name: null,
+    actions: null,
+  },
+
   error: {
     status: "",
     headers: "",

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

@@ -76,7 +76,7 @@
 				<router-link 
 					class="bg-black t-white uppercase t-semi pd-thin radius-extra "
 					:to="{
-						name:'ProductAdd', 
+						name:'Organization_ProductAdd', 
 						params: {
 							_id: route.params._id
 						}

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

@@ -1,6 +1,5 @@
 <template>
-	<div class="">
-		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
+	<div class="bg-white pd-medium">
 		
 		<!-- {{auth.state.accesses}} -->
 

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

@@ -1,10 +1,18 @@
 <template>
-  <div class="flex-v-center flex">
-    <h4 class="mn-r-auto">{{category.name}}</h4>
+  <div class="flex-v-center flex-column flex">
+    <h4 class="mn-r-auto">{{category.order}} / {{category.name}}</h4>
+
+    <!-- <p v-if=" category.children.length > 0" class="w-100">Subcategories:</p> -->
+   <!--  <CardCategory
+      v-for="(subcategory,index) in category.children"
+      :key="subcategory._id"
+      :category="subcategory" 
+      class="pd-l-small bg-white w-100"
+    /> -->
 
     <router-link 
     	:to="{
-				name: 'CategoryEdit', 
+				name: 'Category Edit', 
 				params: { 
 					_id: route.params._id,
 					category: category.url
@@ -14,6 +22,7 @@
     >
     	Edit
    	</router-link>
+
     <a 
     	class="nav-link" 
     	@click="deleteCategory(category)"
@@ -28,6 +37,8 @@
 import { toRef, onMounted, defineEmits } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
+import CardCategory from './CardCategory.vue'
+
 const props = defineProps({
   category: Object,
 });

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

@@ -8,14 +8,8 @@
 		"
 	>
 		<router-link
-			v-if="user && user.roles && (user.roles.includes('ROLE_MODERATOR') || user.roles.includes('ROLE_ADMIN'))"
-      :to="{
-        name: 'ProductEdit', 
-        params: {
-          _id: $route.params.organization,
-          product: product._id
-        }
-      }" 
+			v-if="access"
+      :to="organization ? { name: 'Organization_ProductEdit', params: { _id: organization, product: product._id	} } : { name: 'ProductEdit' }" 
       class="
       	z-index-2
         cursor-pointer 
@@ -37,8 +31,8 @@
 			:class="
 				product.information[2] 
 				&& product.information[2].value === 'AAAA' 
-				? 'bg-black' 
-				: 'bg-white'
+				? 'bg-dark' 
+				: 'bg-light'
 			"
 		>
 
@@ -53,7 +47,7 @@
 				v-else
 				class="pos-absolute h-100 w-100"
 			/>
-			<span v-if="product.quantity <= 0" class="pos-absolute bg-light t-black pd-thin radius-big p-small t-medium pos-t-medium pos-l-medium">Out of Stock</span>
+			<span v-if="product.quantity <= 0" class="pos-absolute bg-white t-black pd-thin radius-big p-small t-medium pos-t-medium pos-l-medium">Out of Stock</span>
 			<THC v-if="product.information?.length > 0 && product.information[1]?.name === 'THC'" :product="product" />
 		</div>
 
@@ -121,6 +115,13 @@
 		product: {
 			type: Object
 		},
+		access: {
+			type: Boolean,
+			default: false
+		},
+		organization: {
+			type: String
+		},
 		user: {
 			type: [Object, String] 
 		},

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

@@ -1,13 +1,15 @@
 <template>
-  <div class="pd-thin">
-    <Block class="radius-big mn-b-thin flex-nowrap flex-v-center flex">
-      <h1 class="mn-r-auto">
+  <div class="pd-thin bg-white">
+    <Block v-if="!MOBILE_APP" 
+      class="radius-big mn-b-thin flex-nowrap flex-v-center flex"
+    >
+      <h2 class="mn-r-auto">
         Product Categories
-      </h1>
+      </h2>
 
       <router-link 
         :to="{
-          name: 'CategoryAdd', 
+          name: 'Category Add', 
           params: { 
             _id: $route.params._id
           } 
@@ -24,30 +26,59 @@
         Change Order
       </Button>
     </Block>
-
-    <VueDraggableNext 
-      class="dragArea list-group w-full" 
-      :list="categories.state.all" 
-      item-key="order" 
-      @end="updateOrder"
-    >
-      <CardCategory 
-        v-for="(category, index) in categories.state.all"
-        :key="category.id"
-        :category="category" 
-        @delete="deleteCategory"
-        class="pd-medium bg-light radius-medium mn-b-thin"
+    <!-- <Feed
+      :states="{
+        empty: {
+          title: 'No Events Found',
+          description: 'Currently, there are no events available.'
+        }
+      }"
+      :store="{
+        read: (options) => categories.actions.read(options),
+        state: categories.state
+      }"
+      :options="{
+          user: auth.state.user._id,
+          rootOnly: true,
+          limit: 10
+      }"
+      v-slot="{ 
+        items 
+      }"
+    > -->
+      <CategoryList 
+        v-if="categories.state.all" 
+        :items="categories.state.all" 
+        :state="categories.state.all" 
+        @update="updateCategoriesOrder" 
       />
-    </VueDraggableNext>
+
+     <!--  <VueDraggableNext 
+        class="dragArea list-group w-full" 
+        :list="items" 
+        item-key="order" 
+        @end="updateOrder"
+      >
+        <CardCategory 
+          v-for="(category,index) in items"
+          :key="category.id"
+          :category="category" 
+          @delete="deleteCategory"
+          class="pd-medium bg-light radius-medium mn-b-thin"
+        />
+      </VueDraggableNext> -->
+    <!-- </Feed> -->
   </div>
 </template>
 
 <script setup>
-  import { onMounted } from 'vue';
+  import { onMounted, onUnmounted, computed } from 'vue';
   import { VueDraggableNext } from 'vue-draggable-next';
 
   import { useRoute, useRouter } from 'vue-router';
 
+  import * as globals from '@pf/src/modules/globals/views/store/globals';
+  import * as auth from '@pf/src/modules/auth/views/store/auth'; 
   import * as categories from '@pf/src/modules/products/store/categories'; 
 
   const route = useRoute();
@@ -55,21 +86,82 @@
 
   import Button from "@pf/src/components/Button/Button.vue";
   import Block from '@pf/src/components/Block/Block.vue';
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+
   import CardCategory from '@pf/src/modules/products/components/blocks/CardCategory.vue';
+  import CategoryList from '@pf/src/modules/products/components/sections/CategoriesTree.vue';
+
+  import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
 
+  globals.state.navigation_bar.actions = [{
+    component: IconPlus,
+    props: {
+      fill: "rgb(var(--main))" 
+    },
+    condition: () => auth.state.user && auth.state.user._id,
+    action: () => route.params._id ? router.push({ name: 'Category Add', params: { _id: route.params._id} }) : router.push({ name: 'Category Add' })
+  }],
+
+ onUnmounted(() => {
+    globals.state.navigation_bar.actions = [];
+  });
+
+categories.state.all = await categories.actions.read({
+      user: auth.state.user._id,
+      rootOnly: true,
+      limit: 10
+    })
   onMounted(async () => {
-    await categories.actions.fetchCategories();
+    
+  });
+
+  const mappedCategories = computed(() => {
+   const recursiveMap = (data) => {
+     return data.map(item => ({
+       // id: item._id, 
+      parent: item.parent,
+      _id: item._id,
+      order: item.order,
+      name: item.name, 
+      children: item.children ? recursiveMap(item.children) : []
+     }));
+   };
+   
+   return recursiveMap(categories.state.all);
   });
 
-  function updateOrder() {
-    categories.state.all.forEach((category, index) => {
-      category.order = index;
-    });
-    updateCategoriesOrder();
+  function flattenCategoryTree(categories) {
+    let flatCategories = [];
+    
+    function flatten(category) {
+      const { children, ...categoryWithoutChildren } = category;
+      flatCategories.push(categoryWithoutChildren);
+      
+      if (children && Array.isArray(children)) {
+        children.forEach(child => flatten(child));
+      }
+    }
+    
+    categories.forEach(category => flatten(category));
+    return flatCategories;
   }
 
-  async function updateCategoriesOrder() {
-    await categories.actions.updateCategories(categories.state.all);
+  // Обновленная функция для обновления порядка категорий
+  async function updateCategoriesOrder(category) {
+    try {
+      // Получаем все категории и преобразуем их в плоский массив
+      const allCategories = categories.state.all;
+      const flattenedCategories = flattenCategoryTree(allCategories);
+      
+      // Обновляем порядок для всех категорий
+      console.log('flated', flattenedCategories)
+      await categories.actions.update(flattenedCategories);
+      
+      console.log('Categories order updated successfully');
+    } catch (error) {
+      console.error('Error updating categories order:', error);
+      throw error;
+    }
   }
 
   async function deleteCategory(category) {