@ozdao/prometheus-framework 0.2.128 → 0.2.129

package/src/modules/marketplace/store/marketplace.js

@@ -14,10 +14,33 @@ const state = reactive({
     result:[]
   },
   filter: {
+    active: false,
     categories: [],
     prices: [],
     delivery: [],
-    extra: []
+    extra: [],
+    options: [{
+      title: 'Categories',
+      value: 'categories',
+      options: []
+    },{
+      title: 'Delivery',
+      value: 'delivery',
+      options: [
+        { label: 'Pickup', value: 'pickup' },
+        { label: 'Courier', value: 'courier' },
+        { label: 'Post', value: 'post' }
+      ]
+    },{
+      title: 'Prices',  
+      value: 'prices',
+      options: [
+        { 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' }
+      ]
+    }],
   },
   sort: {
     param: 'distance',
@@ -35,6 +58,7 @@ const state = reactive({
   }
 });
 
+
 // History
 const history = []; history.push(state);
 

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

@@ -1,4 +1,4 @@
-import * as auth from '../../../modules/auth/store/auth'
+import * as auth from '@pf/src/modules/auth/store/auth'
 
 function requiresAuth(to, from, next) {
 
@@ -16,14 +16,17 @@ function requiresAdmin(to, from, next) {
   const isAdmin = auth.state.access.roles?.includes('ROLE_ADMIN') ? auth.state.access.roles.includes('ROLE_ADMIN') : false;
 
   if (isAdmin !== true) {
-    return next('/404');
+    return next('/401');
   }
 
   next();
 }
 
 function requiresNoAuth(to, from, next) {
+  console.log('hello')
+
   const isLogin = auth.state.access.status;
+   console.log(auth.state.access)
   // to.meta.requiresNoAuth 
   if (isLogin) {
     return next('/profile/' + auth.state.user._id);

package/src/modules/middlewares/server/authJwt.js

@@ -6,23 +6,29 @@ const middlewareFactory = (db) => {
 
   const verifyToken = async (req, res, next) => {
     try {
-      console.log(req.cookies);
-      
+      if (!req.cookies.user) {
+        // Вместо возврата ошибки, просто устанавливаем req.userId как null
+        req.userId = null;
+        return next();
+      }
+
       let user = JSON.parse(req.cookies.user);
       let token = req.headers["x-access-token"] || user.accessToken;
 
       if (!token) {
-        return res.status(403).send({ message: "No token provided!" });
+        // Также устанавливаем req.userId как null
+        req.userId = null;
+        return next();
       }
 
       const decoded = jwt.verify(token, process.env.SECRET_KEY);
       req.userId = decoded._id;
-
-      console.log('success');
+      
       next();
     } catch (err) {
       console.log(err);
-      return res.status(401).send({ message: "Unauthorized!" });
+      req.userId = null;
+      next();
     }
   };
 

package/src/modules/middlewares/server/verifyAccesses.js

@@ -6,11 +6,15 @@ const middlewareFactory = (db) => {
   const verifyRead = (resource) => {
     return async (req, res, next) => {
       try {
-        // Получаем идентификатор организации из запроса
-        const ownerOrgId = new db.mongoose.Types.ObjectId(req.query.owner);;
-
+        if (req.userId === null) {
+          req.query.status = 'published';
+          return next();
+        }
         // Получаем текущего пользователя
         const userId = new db.mongoose.Types.ObjectId(req.userId);
+        
+        // Получаем идентификатор организации из запроса
+        const ownerOrgId = new db.mongoose.Types.ObjectId(req.query.owner);;
 
         // Проверяем, является ли пользователь владельцем организации
         const isOwnerOfOrg = await Organization.exists({

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

@@ -3,7 +3,7 @@
 <section class="pd-thin">
 
 	<!-- Ask to login  -->
-	<AskToLogin class="mn-b-big" v-if="auth.state.access.status === false" /> 
+	<AskToLogin class="mn-b-thin" v-if="auth.state.access.status === false" /> 
 
 	<!-- Order form -->
 	<div class="gap-small mn-b-thin cols-2">
@@ -37,10 +37,11 @@
 		<!-- Order positions -->
 		<div 
 			v-if="shopcart.state.positions.length > 0" 
+			class="bg-light pd-medium radius-big"
 		>
-			<p class="p-big mn-b-small">Your Order</p>
-			
-			<ul class="mn-b-semi">
+			<h4 class="font-second mn-b-thin">Your Order</h4>
+
+			<ul class="flex gap-thin flex-wrap mn-b-thin">
 				<CardOrderItem 
 					v-for="product in shopcart.state.positions" 
 					:key="product._id" 
@@ -49,39 +50,29 @@
 	        :increase="product => shopcart.actions.incrementItemQuantity(product._id)"
 	        :decrease="product => shopcart.actions.decrementItemQuantity(product._id)"
 	        :remove="product => shopcart.actions.removeProduct(product._id)"
+	        class="w-100 bg-white pd-small radius-medium"
 	      />
 			</ul>
 
 			<div 
-				style="border-bottom: 1px solid #f7f7f7; border-top: 1px solid #f7f7f7;" class="pd-b-medium pd-t-medium  mn-b-medium"
+				class="bg-main pd-thin radius-medium  mn-b-thin"
 			>	
-				<p class="mn-b-thin">
+				<p class="pd-small br-b br-solid br-black-transp-10">
 					Subtotal: 
 					{{ returnCurrency() }} 
 					{{ cartTotalPrice }}
 				</p>
-				<p class="mn-b-thin">
+				<p class="pd-small br-b br-solid br-black-transp-10">
 					Delivery: 
 					{{ returnCurrency() }} 
-					{{ 
-						Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10))
-					}} 
+					{{ deliveryCost }}
 				</p>
-				<p class="h3">
+				<p class="pd-small h3">
 					Total: 
 					{{ returnCurrency() }} 
-					{{ 
-						Math.trunc(100 + 20 * orderOrganization[0]?.distance - 7,5 * (orderOrganization[0]?.distance  / 10)) + cartTotalPrice.value 
-					}}  
+					{{ deliveryCost +  cartTotalPrice.value }}
 				</p>
 			</div>
-
-			<p class='mn-b-thin'>
-				By making this purchase you agree to the General Terms and Conditions.
-			</p>
-			<p class='mn-b-small'>
-				I agree that placing the order places me under an obligation to make a payment in accordance with the General Terms and Conditions.
-			</p>
 			<!-- Send order -->
 		  <button 
 		  	v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
@@ -94,10 +85,17 @@
 		      || errorPayment
 		    "
 		    @click="handleCreate()" 
-		    class="bg-main pd-small radius-big w-100 button"
+		    class="bg-main mn-b-small pd-small radius-big w-100 button"
 		  >
 		    Place an Order
 		  </button>
+
+		  <p class='mn-b-thin'>
+				I agree that placing the order places me under an obligation to make a payment in accordance with <a class="t-semi font-second t-second" href="/legal/terms-of-use" target="_blank">Terms of Use.</a>
+			</p>
+			<p >
+				
+			</p>
 		</div>
 
 	</div>
@@ -145,6 +143,20 @@ const router = useRouter()
 const order = computed(() => orders.state.current)
 const user = computed(() => users.state.current)
 const cartTotalPrice = computed(() => shopcart.getters.cartTotalPrice)
+const deliveryCost = computed(() => {
+  if (orders.state.current.delivery.type === 'pickup') return 0;
+  if (orders.state.current.delivery.type === 'mail') return 350;
+  if (orders.state.current.delivery.type === 'courier') {
+    const distance = orderOrganization.value[0]?.distance || 0;
+    return Math.trunc(100 + 20 * distance - 7.5 * (distance / 10));
+  }
+  return 0;
+});
+
+// Computed property for total cost
+const totalCost = computed(() => {
+  return deliveryCost.value + cartTotalPrice.value.value;
+});
 // Organization
 const orderOrganization = ref({})
 

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

@@ -5,7 +5,8 @@
       bg-black 
       t-white 
       pd-big 
-      radius-medium
+      radius-big
+      flex-v-center
       flex-nowrap 
       flex
     "
@@ -20,16 +21,16 @@
       src="@/assets/icons/cross-white.svg"
     > -->
 
-    <p class="mn-r-auto">
-      <span class="t-semi">Already registered?</span><br>
-      <span>Log in to your account to checkout faster.</span>
-    </p>
+    <div class="mn-r-auto">
+      <h3 class="t-semi mn-b-small">Already registered?</h3>
+      <span class="p-medium t-transp">Sign in to your account to checkout faster.</span>
+    </div>
 
     <button 
       @click="toggleSignInPopup()" 
-      class="button"
+      class="button h-4r bg-main"
     >
-      Log In
+      Sign In
     </button>
   </div>
 </template>

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;
 };