@ozdao/prometheus-framework 0.2.317 → 0.2.318

package/src/modules/{products/components/sections/MenuSection.vue → marketplace/views/components/sections/SectionMenu.vue}

@@ -11,38 +11,33 @@
 
 			<ul v-else class="gap-thin grid-container">
 				<router-link :to="getMarketplaceLink([category.url])"
-					v-for="(category,index) in categories.state.all.slice(0,5)" 
+					v-for="(category,index) in categoriesRoot.slice(0,5)" 
 					:key="category" 
 					class="cursor-pointer hover-scale-0 flex-v-center flex-h-center flex-nowrap flex-row flex bg-light radius-big pd-medium grid-item"
 				>
 
 					<video 
-						v-if="category.url === 'buds'" 
+						v-if="category.url === 'buds' && category.photo" 
 						class="w-33 radius-100 o-hidden mn-r-medium" 
 						autoplay loop muted
 					>
 					  <source 
-					  	:src="'/output.webm'" 
+					  	:src="category.photo"
 					  	type="video/webm"
 					  >
 					</video>
 
-					<div class="w-100" :class="{'mn-r-auto':category.url === 'buds'}">
-
-						<div class="w-100 flex-v-center flex-nowrap flex">
-
-							<h3 class="t-black capitalize h3">
-								{{category.name}}
-							</h3>
+					<img loading="lazy" 
+						v-if="category.url !== 'buds' && category.photo"
+						:src="category.photo"
+						class="i-extra t-transp mn-r-thin"
+					>
 
-							<img loading="lazy" 
-								v-if="category.url !== 'buds'"
-								:src="'/icons/categories/' + category.url + '.svg'"
-								class="i-extra t-transp mn-l-auto"
-							>
-						
-						</div>
-						
+					<div class="w-100" :class="{'mn-r-auto':category.url === 'buds'}">
+						<h3 class="t-black capitalize h3">
+							{{category.name}}
+						</h3>
+					
 						<p v-if="category.url === 'buds'" class="mn-t-thin mn-b-thin t-transp t-black p-medium">
 							Unveiling the Exceptional User Curated Best Buds
 						</p>
@@ -53,7 +48,6 @@
 			      >
 			        <span>Check {{countProduct.count}} products →</span>
 			      </button>
-
 					</div>
 				</router-link>
 
@@ -65,6 +59,7 @@
 
 <script setup>
 	import { ref, onMounted,computed } from 'vue'
+
 	import Loader from '@pf/src/components/Loader/Loader.vue'
 
 	import { useRouter } from 'vue-router'
@@ -74,36 +69,31 @@
 	import * as products from '@pf/src/modules/products/store/products';
 
 	const router = useRouter()
+
+	const categoriesRoot = ref(null)
 	
  	const text = {
-    locale: 'en',
-    messages: {
-      en: {
-      	categories: []
-      },
-      ru: {
-      	categories: []
-      }
+    en: {
+    	categories: []
+    },
+    ru: {
+    	categories: []
     }
   }
 
-  categories.state.all.forEach( category => {
-    category.localization.forEach( localization => {
-      text.messages[localization.locale].categories.push(localization.text)
-    })
-  })
 
-	const { t } = useI18n(text)
+	const { t  } = useI18n({
+    messages: text
+  })
 
 	const countProduct = ref(0)
 	const menu = ref(false)
 
 	onMounted( async () => {
 		countProduct.value = await products.actions.read({count: true})
-		await categories.actions.read()
+		categoriesRoot.value = await categories.actions.read({rootOnly: true})
 		menu.value = true
 	})
-
 </script>
 
 <style lang="scss">

package/src/modules/{products → marketplace/views}/router/marketplace.router.js

@@ -1,4 +1,5 @@
 import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue'
+
 import layoutMarketplace from '../components/layouts/Marketplace.vue'
 
 const marketplace = {
@@ -33,6 +34,4 @@ const marketplace = {
   ],
 }
 
-
-
 export default marketplace;

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

@@ -18,7 +18,27 @@
       title="Profile"
       class="mn-b-thin"
     >
-      <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+       
+
+    
+
+       <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+        <UploadImage 
+           v-model:photo="categories.state.current.photo"
+          :uploadPath="'categories'"
+          class="w-8r aspect-1x1 o-hidden mn-r-small radius-extra" 
+        />
+       <Field
+            v-model:field="categories.state.current.name"
+            label="Name"
+            placeholder="Enter category name"
+            class="w-100 mn-b-small bg-white radius-small pd-medium"
+          />  
+      </div>
+
+        <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+
+
          <Field
             v-model:field="categories.state.current.order"
             label="Order"
@@ -33,12 +53,6 @@
           />  
          
       </div>
-       <Field
-            v-model:field="categories.state.current.name"
-            label="Name"
-            placeholder="Enter category name"
-            class="w-100 mn-b-small bg-white radius-small pd-medium"
-          />  
 
       <Select 
         v-model:select="categories.state.current.status"
@@ -173,9 +187,11 @@
 
   import Button from "@pf/src/components/Button/Button.vue";
   import Select from "@pf/src/components/Select/Select.vue";
+  import UploadImage from '@pf/src/components/UploadImage/UploadImage.vue';
   import Field from "@pf/src/components/Field/Field.vue";
   import Feed from '@pf/src/components/Feed/Feed.vue'
 
+
   import Block from '@pf/src/components/Block/Block.vue';
 
   import IconCheckmark from '@pf/src/modules/icons/navigation/IconCheckmark.vue'

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

@@ -124,7 +124,7 @@
   import * as auth from '@pf/src/modules/auth/views/store/auth';
   import * as globals from '@pf/src/modules/globals/views/store/globals';
   import * as products from '@pf/src/modules/products/store/products';
-  import * as marketplace from '@pf/src/modules/products/store/marketplace';
+  import * as marketplace from '@pf/src/modules/marketplace/views/store/marketplace';
   import * as categories from '@pf/src/modules/products/store/categories';
 
   const route = useRoute()

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

@@ -89,7 +89,7 @@ const route = useRoute()
 const router = useRouter()
 
 import * as categories from '@pf/src/modules/products/store/categories';
-import * as marketplace from '@pf/src/modules/products/store/marketplace';
+import * as marketplace from '@pf/src/modules/marketplace/views/store/marketplace';
 
 let options = {
   status: 'published'

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

@@ -1,6 +1,10 @@
 module.exports = (db) => {
   const CategorySchema = new db.mongoose.Schema({
     name: { type: String, required: true, trim: true },
+    description: { type: String, trim: true },
+    photo: {
+      type: String
+    },
     status: {
       type: String,
       enum: ['draft','internal','published','removed'],
@@ -20,5 +24,6 @@ module.exports = (db) => {
   CategorySchema.index({ 'owner.target': 1, 'creator.target': 1});
   
   const Category = db.mongoose.model('Category', CategorySchema, 'categories');
+
   return Category;
 };

package/src/modules/products/products.client.js

@@ -1,15 +1,12 @@
 // Router
 import { createProductRoutes } from './router/products.router';
-import routerMarketplace from './router/marketplace.router.js';
 
 //Store
 import * as storeCategories from './store/categories.js';
 import * as storeLeftovers from './store/leftovers.js';
 import * as storeProducts from './store/products.js';
-import * as storeMarketplace from './store/marketplace.js';
 
 // Layouts 
-import Marketplace from './components/layouts/Marketplace.vue';
 
 // Blocks
 import ImagesThumbnails from './components/blocks/ImagesThumbnails.vue';
@@ -25,11 +22,9 @@ import CardPosition from './components/blocks/CardPosition.vue';
 import SectionProduct from './components/sections/SectionProduct.vue';
 import HeroRecommendation from './components/sections/HeroRecommendation.vue';
 import FilterProducts from './components/sections/FilterProducts.vue';
-import MenuSection from './components/sections/MenuSection.vue';
 import EditModifications from './components/sections/EditModifications.vue';
 import PopularProducts from './components/sections/PopularProducts.vue';
 import EditProductInfo from './components/sections/EditProductInfo.vue';
-import Filters from './components/sections/Filters.vue';
 
 // Elements
 import Price from './components/elements/Price.vue';
@@ -42,7 +37,6 @@ import EditLeftover from './components/pages/EditLeftover.vue';
 import ProductRecommendation from './components/pages/ProductRecommmendation.vue';
 import Products from './components/pages/Products.vue';
 import Leftovers from './components/pages/Leftovers.vue';
-import Catalog from './components/pages/Catalog.vue';
 
 // Пример функции инициализации для модуля продуктов
 function initializeProducts(app, store, router, options = {}) {
@@ -51,12 +45,10 @@ function initializeProducts(app, store, router, options = {}) {
   const routesProducts = createProductRoutes();
   
   router.addRoute(route, routesProducts);
-  router.addRoute(route, routerMarketplace);
   
   store.addStore('categories', storeCategories);
   store.addStore('leftovers', storeLeftovers);
   store.addStore('products', storeProducts);
-  store.addStore('marketplace', storeMarketplace);
 }
 
 const ModuleProducts = {
@@ -89,11 +81,9 @@ const ModuleProducts = {
       SectionProduct,
       HeroRecommendation,
       FilterProducts,
-      MenuSection,
       EditModifications,
       PopularProducts,
       EditProductInfo,
-      Filters,
       // Pages
       Product,
       ProductEdit,
@@ -101,9 +91,7 @@ const ModuleProducts = {
       ProductRecommendation,
       Products,
       Leftovers,
-      Catalog,
       // Layouts
-      Marketplace
     }
   }
 }
@@ -122,11 +110,9 @@ export {
   SectionProduct,
   HeroRecommendation,
   FilterProducts,
-  MenuSection,
   EditModifications,
   PopularProducts,
   EditProductInfo,
-  Filters,
   // Elements
   Price,
   THC,
@@ -137,9 +123,7 @@ export {
   ProductRecommendation,
   Products,
   Leftovers,
-  Catalog,
   // Layouts
-  Marketplace
 };
 
 export default ModuleProducts;

package/src/modules/products/store/categories.js

@@ -7,12 +7,14 @@ import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // State
 const state = reactive({
   all: [],
+  
   filter: {
     status: null,
     search: null
   },
   current: {
     order: 1,
+    photo: null,
     name: "",
     url: "",
     status: "draft",
@@ -57,6 +59,10 @@ const actions = {
       // Handle both single category and bulk update
       const isArray = Array.isArray(categories);
 
+      console.log(isArray)
+
+       console.log(isArray ? categories : [categories])
+      
       const response = await $axios.post('/api/categories/update', {
         categories: isArray ? categories : [categories],
       });

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

@@ -56,12 +56,9 @@
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
- 	// import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
-
-
 	import * as globals from '@pf/src/modules/globals/views/store/globals';
 	import * as categories from '@pf/src/modules/products/store/categories';
-	import * as marketplace from '@pf/src/modules/products/store/marketplace';
+	import * as marketplace from '@pf/src/modules/marketplace/views/store/marketplace';
 
 	// Accessing router and store
 	const route = useRoute()

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

@@ -25,7 +25,7 @@ import Button from '@pf/src/components/Button/Button.vue'
 import { state, actions } from '@pf/src/modules/organizations/store/organizations'
 
 import * as globals from '@pf/src/modules/globals/views/store/globals';
-import * as marketplace from '@pf/src/modules/products/store/marketplace';
+import * as marketplace from '@pf/src/modules/marketplace/views/store/marketplace';
 
 const router = useRouter();
 const route = useRoute();

package/src/modules/landing/components/sections/SectionsSection.vue

@@ -1,66 +0,0 @@
-<template>
-<div id="sections" class="pd-thin">
-  <h2 class="mn-auto pd-t-big pd-b-big t-center" v-html="t('title')"/>
-  
-  <div class="cols-4 gap-thin">
-    <router-link to="/marketplace" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/1.png" alt="" class="w-100 object-fit-cover">
-      <h3 class="mn-b-medium">{{t('section1.title')}}</h3>
-      <p class="t-transp">{{t('section1.text')}}</p>
-    </router-link >
-
-    <router-link to="/spots" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/2.png" alt="" class="w-100 object-fit-cover">
-      <h3 class="mn-b-medium">{{t('section2.title')}}</h3>
-      <p class="t-transp">{{t('section2.text')}}</p>
-    </router-link>
-
-    <router-link to="/community" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/3.png" alt="" class="w-100 object-fit-cover">
-      <h3 class="mn-b-medium">{{t('section3.title')}}</h3>
-      <p class="t-transp">{{t('section3.text')}}</p>
-    </router-link>
-
-    <router-link to="/governance" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/4.png" alt="" class="w-100 object-fit-cover">
-      <h3 class="mn-b-medium">{{t('section4.title')}}</h3>
-      <p class="t-transp">{{t('section4.text')}}</p>
-    </router-link>
-  </div>
-
-</div>
-</template>
-
-<script setup>
-  import { useI18n } from 'vue-i18n'
-    
-  const text = {
-    messages: {
-      en: {
-        title: 'Dive Deeper Into <b> Weeder Platform</b>',
-        section1: {
-          title: 'Marketplace',
-          text: 'A simple platform for buying and selling weed, joints, and everything else from seeds to grow boxes'
-        },
-        section2: {
-          title: 'Spots',
-          text: 'Discover the top spots for purchasing or sharing a smoke with like-minded cannabis enthusiasts'
-        },
-        section3: {
-          title: 'Community',
-          text: 'Engage with our community to discuss cannabis news and innovations'
-        },
-        section4: {
-          title: 'Governance',
-          text: 'Join platform stakeholders in governance, playing an active role in molding our collective future'
-        }
-      }
-    }
-  }
-
-  const { t } = useI18n(text)
-</script>
-
-<style lang="scss">
-
-</style>

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

@@ -1,152 +0,0 @@
-<template>
-	<div class="z-index-1 pos-relative radius-big bg-black t-white pd-medium flex-v-center flex-nowrap flex">
-    <div class="mn-r-auto pd-micro gap-micro br-solid br-2px br-white  radius-extra flex-nowrap flex"
-    >
-  		<Dropdown 
-        id="fitlerCategory"
-  			:label="t('categoriesTitle')" 
-  			class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
-  			:class="[
-          marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
-        ]"
-  		>
-  			<div class="w-100 h-100 radius-semi o-hidden bg-black">
-        	<Checkbox 
-    				v-for="(category, index) in categories"
-            :label="category.name"
-            name="categories"
-            :value="category.url"
-            class="cursor-pointer  w-100  bg-black t-white radius-small pd-small"
-            :radio="marketplace.state.filter.categories"
-            @update:radio="event => marketplace.state.filter.categories = event"
-          />
-       	</div>
-       </Dropdown>
-
-      <Dropdown 
-        id="fitlerPrice"
-       	:label="t('filters.price.title')" 
-       	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
-       	:class="[
-          marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
-        ]"
-       >
-        <div class="w-100 h-100 radius-semi o-hidden bg-black">
-        	<Checkbox 
-    				v-for="(price, index) in prices"
-            :label="price.label"
-            name="prices"
-            :value="price.value"
-            class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-            :radio="marketplace.state.filter.prices"
-            @update:radio="event => marketplace.state.filter.prices = event"
-          />
-        </div>
-       </Dropdown>
-
-      <Dropdown 
-     	  label="Delivery" 
-        id="fitlerDelivery"
-       	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
-       	:class="[
-          marketplace.state.filter.delivery.length > 0 ? 'bg-white t-black' : ''
-        ]"
-      >
-        <div class="w-100 h-100 radius-semi o-hidden bg-black">
-        	<Checkbox 
-    				v-for="(delivery, index) in delivery"
-            :label="delivery.label"
-            name="prices"
-            :value="delivery.value"
-            class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-            :radio="marketplace.state.filter.delivery"
-            @update:radio="event => marketplace.state.filter.delivery = event"
-          />
-        </div>
-      </Dropdown>
-    </div>
-  </div>
-
-</template>
-
-<script setup>
-	import { computed, onMounted, ref } from 'vue'
-
- 	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
-  import Radio from "@pf/src/components/Radio/Radio.vue";
- 	import Select from "@pf/src/components/Select/Select.vue";
- 	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
-
-	import { useI18n } from 'vue-i18n'
-
-	import * as marketplace from '@pf/src/modules/products/store/marketplace';
-  import * as categories from '@pf/src/modules/products/store/categories';
-
-	const delivery = [
-    { label: 'Pickup',					value: 'pickup' },
-    { label: 'Courier',					value: 'courier' },
-    { label: 'Post',						value: 'post' }
-	]
-
-	const prices = [
-    { label: 'Under 300฿',				value: '<300' },
-    { label: '300฿ to 600฿',			value: '300-600' },
-    { label: '600฿ to 1200฿',			value: '600-1200' },
-    { label: '$1200 and above',		value: '>1200' }
-	]
-
-	const text = {
-    locale: 'en',
-    messages: {
-      en: {
-      	categoriesTitle: 'Category',
-      	categories: [],
-      	sort: {
-      		price: 'By price',
-      		newest: 'By newest',
-      		popularity: 'By popularity'
-      	},
-      	filters: {
-      		title: 'Filters',
-      		price: {
-      			title: 'Price',
-      			from: 'From',
-      			to: 'To'
-      		},
-      		filters: [],
-      		reset: 'Reset Filters'
-      	}
-      },
-      ru: {
-      	categoriesTitle: 'Категория',
-      	sort: {
-      		price: 'По цене',
-      		newest: 'По новизне',
-      		popularity: 'По популярности'
-      	},
-      	filters: {
-      		title: 'Фильтры',
-      		price: {
-      			title: 'Цена',
-      			from: 'От',
-      			to: 'До'
-      		},
-      		filters: [],
-      		reset: 'Сбросить фильтры',
-      	}
-      }
-    }
-  }
-
-	const { t } = useI18n(text)
-
-	onMounted(async () => {
-    let options = {
-      status: 'published'
-    }
-
-		await categories.actions.read(options)
-	})
-
-	
-</script>