@ozdao/prometheus-framework 0.2.128 → 0.2.130

package/src/modules/orders/components/sections/FormDelivery.vue

@@ -1,12 +1,12 @@
 <template>
   <Block title="Delivery" class="mn-b-thin" :tooltip="'Delivery by mail takes 3-5 days.'">
 
-    <h4 class="mn-b-thin">Spot</h4>
+    <!-- <h4 class="mn-b-thin">Select spot</h4>
     <div class="mn-b-small flex-nowrap flex">
 
-    </div>
+    </div> -->
 
-     <h4 class="mn-b-thin">Select zone</h4>
+    <h4 class="font-second mn-b-thin">Select deliverty type</h4>
     <div class="mn-b-small flex-nowrap flex">
       <Radio 
         v-model:radio="order.delivery.type"
@@ -24,20 +24,20 @@
         v-model:radio="order.delivery.type"
         label="Post"
         value="mail"
-        class="bg-white pd-medium radius-small w-100 mn-r-small"
+        class="bg-white pd-medium radius-small w-100"
       />
     </div>
 
     
     
-    <h4 class="mn-b-thin">Address</h4>
+    <h4 class="font-second mn-b-thin">Address</h4>
     <Address
       label="Location"    
       :apiKey="GOOGLE_MAPS_API_KEY" 
       :address="order.delivery.address" 
       :location="order.delivery.location"  
       placeholder="Enter your address"  
-      class="bg-white radius-tl-medium radius-tr-medium t-black br-grey-transp-25 br-solid br-2px pd-medium"
+      class="bg-white radius-tl-medium radius-tr-medium t-black pd-medium"
       @update:location="newLocation => {
         order.delivery.location = newLocation;
       }"

package/src/modules/orders/router/orders.router.js

@@ -1,12 +1,13 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
+import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
 
 const orders = {
   path: 'orders',
   component: layoutEmpty,
+  name: 'Orders',
   meta: {
     title: {
-      en: 'Marketplace',
-      ru: 'Маркетплейс'
+      en: 'Orders',
+      ru: 'Заказы'
     }
   },
   children: [{
@@ -43,4 +44,6 @@ const orders = {
   }]
 };
 
+
+
 export default orders;

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

@@ -174,8 +174,8 @@ import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUs
 import MembersAdd from '@pf/src/modules/organizations/components/sections/MembersAdd.vue';
 
 // Mobile Module
-import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
-import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+import Menu from '@pf/src/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
 
 import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue';
 import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';

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

@@ -150,8 +150,8 @@
 	import Block  		from '@pf/src/components/Block/Block.vue'
 	import Feed from '@pf/src/components/Feed/Feed.vue'
 	// Mobile Module
-	import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
-	import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+	import Menu from '@pf/src/components/Menu/Menu.vue'
+	import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
 	// Organizations
 	import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
 	import User from '@pf/src/modules/users/components/blocks/CardUser.vue';

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

@@ -0,0 +1,204 @@
+<template>
+	<div class="">
+		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
+		
+		<Menu 
+			class="bg-light mn-b-semi"
+		>
+			<MenuItem 
+				v-if="hasAccess(route.params._id, 'members', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Organization Members', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer"
+		  >
+		  	<IconGroups class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Members
+		    </span>
+		  </MenuItem>
+
+		  <!-- <MenuItem 
+		  	@click="router.push({
+		  		name: 'Backoffice Community', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		    <span>
+		    	Community
+		    </span>
+		  </MenuItem> -->
+
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'products', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Products', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconProducts class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Products
+		    </span>
+		  </MenuItem>
+
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'leftovers', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Leftovers', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconLeftovers class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Leftovers
+		    </span>
+		  </MenuItem>
+
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'orders', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Backoffice Orders', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconOrders class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Orders
+		    </span>
+		  </MenuItem>
+
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'gallery', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Backoffice Gallery', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconGallery class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Gallery
+		    </span>
+		  </MenuItem>
+		  
+		  <MenuItem 
+		  	v-if="hasAccess(route.params._id, 'events', 'read', auth.state.accesses)"
+		  	@click="router.push({
+		  		name: 'Backoffice Events', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		  	<IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
+		    <span>
+		    	Events
+		    </span>
+		  </MenuItem>
+
+		 <!--  <MenuItem 
+		  	@click="router.push({
+		  		name: 'Payments', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		    <span>
+		    	Payments
+		    </span>
+		  </MenuItem> -->
+		</Menu>
+
+		<!-- <Menu 
+			class="bg-light"
+		>
+			<MenuItem 
+		  	@click="router.push({
+		  		name: 'Backoffice Organizations', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		    <span>
+		    	Organizations
+		    </span>
+		  </MenuItem>
+
+		  <MenuItem 
+		  	@click="router.push({
+		  		name: 'Backoffice Reports', 
+		  		params: {
+		  			_id: route.params._id
+		  		}
+		  	})" 
+		  	class="cursor-pointer">
+		    <span>
+		    	Reports
+		    </span>
+		  </MenuItem>
+		</Menu> -->
+	</div>
+</template>
+
+<script setup="props">
+/////////////////////////////
+// COMPONENT DEPENDENCIES
+/////////////////////////////
+import { ref, onMounted } from 'vue';
+
+// Mobile Module
+import Menu from '@pf/src/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
+import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
+
+import IconProducts from '@pf/src/modules/icons/entities/IconProducts.vue'
+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 IconGallery from '@pf/src/modules/icons/entities/IconGallery.vue'
+import IconOrders from '@pf/src/modules/icons/entities/IconOrders.vue'
+import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
+/////////////////////////////
+// HELPERS
+/////////////////////////////
+import { useRoute, useRouter } from 'vue-router'
+
+import * as auth  from '@pf/src/modules/auth/store/auth'
+
+import * as organizations  from '@pf/src/modules/organizations/store/organizations'
+
+const route = useRoute()
+const router = useRouter()
+/////////////////////////////
+// CREATED
+/////////////////////////////
+const props = defineProps({
+  favorites: Array,
+});
+
+const selectedOrganization = ref(null);
+const publics = ref([]);
+/////////////////////////////
+// MOUNTED
+/////////////////////////////
+onMounted(async () =>{
+})
+</script>
+
+<style lang="scss">
+</style>

package/src/modules/organizations/router/backoffice.router.js

@@ -0,0 +1,25 @@
+import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
+
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
+const backofficeRoutes = [{
+  path: 'backoffice',
+  component: layoutEmpty,
+  // beforeEnter: [
+  //   validationAuth.requiresAdmin,
+  // ],
+  children: [{
+    path: '',
+    name: 'Backoffice',
+    meta: {
+      title: {
+        en: 'Backoffice',
+        ru: 'Управление'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'Organizations' */ '@pf/src/modules/organizations/components/pages/OrganizationBackoffice.vue'),
+  }]
+}];
+
+export default backofficeRoutes;

package/src/modules/organizations/router/organizations.js

@@ -9,8 +9,9 @@ import leftoversRoutes from '@pf/src/modules/products/router/leftovers.router.js
 
 import paymentsRoutes from '@pf/src/modules/wallet/views/router/payments.router.js'
 import ordersBackofficeRoutes from '@pf/src/modules/orders/router/orders.backoffice.router.js'
+import galleryBackofficeRoutes from '@pf/src/modules/gallery/router/gallery.backoffice.router.js'
 
-import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
+import backofficeRoutes from '@pf/src/modules/organizations/router/backoffice.router.js'
 
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
@@ -63,6 +64,7 @@ const organizations = [{
       ...leftoversRoutes,
       ...paymentsRoutes,
       ...ordersBackofficeRoutes,
+      ...galleryBackofficeRoutes,
       ...backofficeRoutes 
     ],
   },{

package/src/modules/pages/router/pages.router.js

@@ -0,0 +1,15 @@
+const pages = [
+  {
+    path: 'pages/:url',
+    name: 'Page',
+    meta: {
+      title: {
+        en: 'Page',
+        ru: 'Страница'
+      }
+    },
+    component: () => import(/* webpackChunkName: 'Page' */ '@pf/src/modules/landing/components/pages/Page.vue')
+  }
+];
+
+export default pages;

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

@@ -1,18 +1,17 @@
 <template>
-  <div class="product-images">
-    <div class="no-responsive cols-4 gap-thin">
+  <div class="o-scroll product-images">
+    <div class="no-responsive flex flex-nowrap gap-thin">
       <img
         v-for="(image, index) in images"
         :key="index"
         :src="(FILE_SERVER_URL || '') + image" 
-        @click="openPopup(index)"
-        class="radius-medium bg-white o-hidden thumbnail"
+        @click="openPopup(image)"
+        class="flex-child flex-child-grow-1 aspect-1x1 radius-semi bg-white o-hidden thumbnail"
       />
     </div>
     <Popup @close-popup="closePopup" :isPopupOpen="isPopupVisible" class="radius-medium o-hidden">
-      <Magnifier 
-        :imageSrc="(FILE_SERVER_URL || '') + images[selectedimageIndex]"
-        class="magnifier z-index-4"
+      <PhotoViewer
+        :photoUrl="(FILE_SERVER_URL || '') + selectedImage"
       />
     </Popup>
   </div>
@@ -21,8 +20,8 @@
 <script setup>
 import { ref } from "vue";
 
-import Popup          from '@pf/src/components/Popup/Popup.vue'
-import Magnifier          from '@pf/src/components/Magnifier/Magnifier.vue'
+import Popup from '@pf/src/components/Popup/Popup.vue'
+import PhotoViewer from '@pf/src/components/PhotoViewer/PhotoViewer.vue'
 
 const props = defineProps({
   images: {
@@ -32,10 +31,10 @@ const props = defineProps({
 });
 
 const isPopupVisible = ref(false);
-const selectedimageIndex = ref(0);
+const selectedImage = ref(null);
 
-const openPopup = (index) => {
-  selectedimageIndex.value = index;
+const openPopup = (image) => {
+  selectedImage.value = image;
   isPopupVisible.value = true;
 };
 

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

@@ -15,7 +15,7 @@
 
 <script setup="props">
 	// Import components
-	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
+	// import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import PopularProducts 	from '@pf/src/modules/products/components/sections/PopularProducts.vue'
 	import SectionProduct from '@pf/src/modules/products/components/sections/SectionProduct.vue'
 	// Import libs
@@ -31,8 +31,7 @@
 	const route = useRoute()
 	const router = useRouter()
 
-	await products.actions.fetchProduct(route.params.product);
-
+	
 	route.meta.title.en = products.state.current.name
 	route.meta.title.ru = products.state.current.name
 
@@ -49,6 +48,11 @@
 			}
 		}
 	};
+
+	onMounted(async ()=> {
+		await products.actions.fetchProduct(route.params.product);
+
+	})
 	
 	// products.state.current.localization.forEach(localization => {
   	// if (localization) text.messages[localization.locale].description = localization.text

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

@@ -1,10 +1,10 @@
 <template>
-    <div id="product-recommendation" class="h-min-100vh t-white bg-black">
+    <div id="product-recommendation" class="h-min-100 pd-thin t-white bg-black">
         <Loader v-if="loading" :status="loadingText" class="pos-fixed"/>
 
         <div v-if="!loading && !showInput" class="section">
 
-            <div v-if="!loading" class="mn-b-big">
+            <div v-if="!loading" class="mn-b-thin">
                 <FieldBig 
                     :input="inputValue" 
                     :loopTyping="false"
@@ -13,13 +13,14 @@
                     :action="t('action')"
                     @update:input="inputValue = $event"
                     @action="submitInput"
-                    class="t-white bs-blur-regular w-100"
+                    class="t-white bg-dark-transp-50 w-100"
                  />
             </div>
 
             <SectionProduct 
                 :product="products.state.current" 
                 :recommendation="products.state.current.recommendation" 
+                class="bg-dark-transp-50 pd-big radius-big"
             />
         </div>
     </div>
@@ -53,13 +54,13 @@ const text = {
             TITLE: "Increase Your High,<br><b class='t-white'>Powered by AI Budtender</b>",
             DESCRIPTION: "AI's got your chill, bro. We're picking out the most cosmic weed strains based on your desired vibe:",
             placeholder: 'Describe your desired high, bro...',
-            action: "Transmit Vibes →",
+            action: "Transmit →",
         },
         ru: {
             TITLE: "Персональный Накур,<br><b class='t-white'>Напрямую от AI</b>",
             DESCRIPTION: "AI на страже твоего релакса, бро. Мы подбираем самые космические сорта травы, исходя из твоего желаемого настроения:",
             placeholder: 'Опиши свой желамый хай, bro...',
-            action: "Передать Вайб →",
+            action: "Передать →",
         }
     }
 }

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

@@ -1,5 +1,5 @@
   <template>
-    <div class="pd-medium bg-white-transp-50 radius-big">
+    <div class="pd-medium bg-light radius-big">
       <!-- Categories Filter -->
       <Spoiler 
         class="radius-small o-hidden mn-b-small"
@@ -46,11 +46,11 @@
         </template>
       </Spoiler>
 
-      <!-- <hr class="mn-b-small"> -->
+      <hr class="mn-b-small">
 
       <!-- Delivery Filter -->
-     <!--  <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey-transp-25 mn-b-small"
+      <Spoiler 
+        class="radius-small o-hidden mn-b-small"
         :status="false"
       >
         <template #header>
@@ -69,7 +69,7 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-semi"> -->
+      <hr class="mn-b-semi">
 
       <!-- Reset filter -->
       <button @click="resetFilters" class="bg-main w-100 button">{{ t('filters.reset') }}</button>
@@ -158,7 +158,7 @@ onMounted(async () => {
       delivery: query.delivery ? query.delivery.split(',') : [],
       // Продолжайте этот паттерн для остальных полей фильтра
     };
-    marketplace.state.filter = newFilterValue;
+    marketplace.state.filter.innerHTML = newFilterValue;
   }
 })
 

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

@@ -71,7 +71,7 @@
 
 <template>
 	<div 
-		class="pd-t-8r pd-big bg-black t-white pos-relative o-hidden "
+		class="pd-big bg-black t-white pos-relative o-hidden "
 	>
 		<div class="flex-column flex-center flex t-center pos-relative z-index-1">
 			

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

@@ -1,6 +1,5 @@
 <template>
-<div id="popularProducts" class="pd-thin">
-	<div class="bg-light radius-big pd-t-big pd-b-big">
+	<div id="popularProducts" class="bg-light radius-big pd-t-big pd-b-big">
 
 		<h2 class="mn-b-semi t-center " v-html="t('title')"/>
 		
@@ -34,7 +33,6 @@
     	</div>
 		</div>
 	</div>
-</div>
 </template>
 
 

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

@@ -1,8 +1,8 @@
 <template>
-	<div class="cols-2-1_2 w-100 gap-big">
+	<div class="cols-2-1_2 w-100 gap-thin">
 		
-		<div class="flex-nowrap flex-column flex pos-relative">
-			<div class="h-100 h-max-50vh bg-light radius-big o-hidden">
+		<div class="pd-small bg-light radius-big flex-nowrap flex-column flex pos-relative">
+			<div class="w-100 bg-light radius-semi o-hidden">
 				<!-- PRODUCT IMAGE -->
 				<Images360
 					v-if="product && product.image3d"
@@ -13,7 +13,7 @@
 
 				<img
 					v-if="images[0] && !product.image3d"
-					class="h-100 bg-light w-100"
+					class="h-auto bg-light w-100"
 					style="object-fit: contain;"
 					:src="(FILE_SERVER_URL || '') + images[0]"
 				/>
@@ -29,11 +29,11 @@
 			<ImagesThumbnails
 				v-if="images.length > 1"
 				:images="images"
-				class="mn-t-medium"
+				class="mn-t-thin"
 			/>
 		</div>
 
-		<div class="pos-relative w-100 h-100 flex-column flex-justify flex col">
+		<div class="pd-big bg-light radius-big pos-relative w-100 h-100 flex-column flex-justify flex col">
 
 		<!-- <IconEdit
 			@click="$router.push({
@@ -75,7 +75,7 @@
 				<div 
 					v-if="product.information.length > 0" 
 					v-for="information in product.information" 
-					class="w-100 pd-small radius-small bg-light-transp-30 product-information"
+					class="w-100 pd-small radius-small bg-grey-transp-10 product-information"
 				>
 					<p class="t-demi">{{ information.name }}</p>
 					<p>{{ information.value }}</p>
@@ -91,7 +91,7 @@
 						success: ' ✔ Added',
 						error: 'error'
 					}"
-					class="w-100 mn-r-small bg-main button"
+					class="h-3r w-100 mn-r-small bg-main button"
 				> 
 						{{ t('addtoorder') }}
 				</Button>