@ozdao/prometheus-framework 0.2.128 → 0.2.130

package/src/modules/globals/components/partials/Footer.vue

@@ -1,6 +1,11 @@
 <template>
-<div class="pd-t-zero pd-thin">
-  <footer class="bg-light t-black radius-big pd-thin">
+  <footer 
+    class="pd-thin pd-t-zero"
+    :class="{
+      't-black bg-white': route.meta.footer_theme === 'light',
+      't-white bg-black': route.meta.footer_theme === 'dark'  
+    }"
+  >
 <!-- 
     <div id="top-footer" class="cols-3 section">
      
@@ -90,18 +95,25 @@
       <a href="https://ozdao.dev" class="t-main" target="_blank" rel="noopener" >OZ DAO.</a>
     </p>
   </footer>
-</div>
 </template>
 
 <script setup="props">
   import { computed,onMounted, toRefs,ref } from 'vue'
-  import { useRouter } from 'vue-router'
+  import { useRouter, useRoute } from 'vue-router'
   import { useI18n }    from 'vue-i18n'
   
   import * as categories from '@pf/src/modules/products/store/categories';
 
+  // Props
+  const props = defineProps({
+    theme: {
+      type: String,
+      default: "light"
+    }
+  });
+
   const router = useRouter()
-  // await dispatch('pages/fetchAll')
+  const route = useRoute()
     
   const text = {
     locale: 'en',

package/src/modules/globals/components/partials/Header.vue

@@ -56,19 +56,28 @@
 			z-index-2 
 		"
 		:class="{
-  		't-black': theme === 'light',
-  		't-white': theme === 'dark'  
+  		't-black bg-white': theme === 'light',
+  		't-white bg-black': theme === 'dark'  
   	}"
 	>
 		<!-- MENU -->
 		<button  
-			@click.stop="() => store.globals.state.isOpenSidebar = !store.globals.state.isOpenSidebar" 
-			class="menu-btn mobile-only"
+			@click="() => store.globals.state.isOpenSidebar = !store.globals.state.isOpenSidebar" 
+			class="mobile-only menu-btn"
 			:class="{
 				'menu-btn_active': store.globals.state.isOpenSidebar
 			}"
 		>
-	    <span/>
+	    <span
+	    	class="no-events"
+		    :class="{
+		      'bg-black': theme === 'light',
+		      'bg-white': theme === 'dark'
+		    }"
+		  >
+		    <span class="menu-btn__before" :class="{ 'bg-black': theme === 'light', 'bg-white': theme === 'dark' }"></span>
+		    <span class="menu-btn__after" :class="{ 'bg-black': theme === 'light', 'bg-white': theme === 'dark' }"></span>
+		  </span>
 	  </button>
 
 		<!-- LOGO -->
@@ -130,7 +139,7 @@
 			:counter="store.shopcart.getters.cartTotalAmount" 
 			:showSucces="false"
 			:showLoader="false"
-			class="pd-zero mn-l-auto"
+			class="pd-zero mn-l-auto mn-r-micro"
 			> 
 			<IconShopcart 
 				class="i-semi"
@@ -158,7 +167,7 @@
 		</Button>
 
 
-		<Select 
+		<!-- <Select 
 			v-model:select="$i18n.locale"
 		  :options="[{name: '🌎&nbsp;En', value: 'en'}, {name: '🇷🇺&nbsp;Ru', value: 'ru'}]"
 		  :property="'value'"
@@ -167,7 +176,7 @@
     		'bg-light t-black': theme === 'light',
     		'bg-dark t-white': theme === 'dark'  
     	}"
-    />
+    /> -->
 	</header>
 </template>
 
@@ -186,27 +195,37 @@
   position: relative;
 }
 .menu-btn span,
-.menu-btn span::before,
-.menu-btn span::after {
+.menu-btn__before,
+.menu-btn__after {
   position: absolute;
-  top: 50%; margin-top: -1px;
-  left: 50%; margin-left: -10px;
+  top: 50%;
+  margin-top: -1px;
+  left: 50%;
+  margin-left: -10px;
   width: 20px;
   height: 2px;
-  background-color: rgb(var(--black));
 }
-.menu-btn span::before,
-.menu-btn span::after {
-  content: '';
+.menu-btn__before,
+.menu-btn__after {
   display: block;
   transition: 0.2s;
 }
-.menu-btn span::before {
+.menu-btn__before {
   transform: translateY(-5px);
 }
-.menu-btn span::after {
+.menu-btn__after {
   transform: translateY(5px);
 }
+.menu-btn_active .menu-btn__before {
+  transform: rotate(-35deg);
+  width: 10px;
+  transform-origin: left bottom;
+}
+.menu-btn_active .menu-btn__after {
+  transform: rotate(35deg);
+  width: 10px;
+  transform-origin: left top;
+}
 
 .menu-btn_active span:before {
   transform: rotate(-35deg);

package/src/modules/globals/components/partials/Navigation.vue

@@ -3,12 +3,14 @@
     <li>
       <router-link  
         :to="getMarketplaceLink(null,store.globals.state.position?.country,store.globals.state.position?.state,store.globals.state.position?.city)"
+        class="font-second"
      >
         {{ t('HEADER.MENU.MARKETPLACE') }}
       </router-link>
     </li>
     <li>
       <router-link    
+        class="font-second"
         :to="getSpotsLink(store.globals.state.position?.country,store.globals.state.position?.state,store.globals.state.position?.city)"
      >
         {{ t('HEADER.MENU.DISPENSARIES') }}
@@ -23,17 +25,19 @@
       </router-link>
     </li> -->
     
-    <li>
+   <!--  <li>
       <router-link  
         to="/events"
+        class="font-second"
      >
         {{ t('HEADER.MENU.EVENTS') }}
       </router-link>
-    </li>
+    </li> -->
    
     <li>
       <router-link  
         to="/community" 
+        class="font-second"
      >
         {{ t('HEADER.MENU.BLOG') }}
       </router-link>
@@ -41,6 +45,7 @@
     <li>
       <router-link  
         to="/governance" 
+        class="font-second"
      >
         {{ t('HEADER.MENU.GOVERNANCE') }}
       </router-link>

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

@@ -40,7 +40,7 @@
           > 
             <span 
               v-if="te('features.soonLabel')"
-              class="z-index-2 radius-big bg-main t-semi uppercase pd-l-thin pd-r-thin pos-absolute pos-r-small-negative pos-t-small-negative"
+              class="z-index-2 radius-big bg-main t-semi uppercase pd-l-thin pd-r-thin pos-absolute pos-r-10-negative pos-t-10-negative"
             >
               {{ t('features.soonLabel') }}
             </span>
@@ -54,7 +54,7 @@
           > 
             <span 
               v-if="te('features.soonLabel')"
-              class="z-index-2 pd-l-thin pd-r-thin radius-big bg-main t-semi uppercase pos-absolute pos-r-small-negative pos-t-small-negative"
+              class="z-index-2 pd-l-thin pd-r-thin radius-big bg-main t-semi uppercase pos-absolute pos-r-10-negative pos-t-10-negative"
             >
               {{ t('features.soonLabel') }}
             </span>

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

@@ -17,7 +17,7 @@
             action="Subscribe"
             @update:input="email = $event"
             @action="sendApplication"
-            class="mn-l-auto mn-r-auto bg-white t-black w-50"
+            class="mn-l-auto mn-r-auto bg-white t-black w-100 w-max-30r"
           />
         </div>
       </div>

package/src/modules/landing/router/landing.js

@@ -3,7 +3,8 @@ const landing = [
     path: '',
     name: "Home",
     meta: {
-      title_hide: true
+      title_hide: true,
+      header_theme: 'dark',
     },
     component: () => import(/* webpackChunkName: 'Home' */ '@pf/src/modules/landing/components/pages/Home.vue'),
   },
@@ -29,17 +30,6 @@ const landing = [
     },
     component: () => import(/* webpackChunkName: 'Governance' */ '@pf/src/modules/landing/components/pages/Farming.vue'),
   },
-  {
-    path: 'pages/:url',
-    name: 'Page',
-    meta: {
-      title: {
-        en: 'Page',
-        ru: 'Страница'
-      }
-    },
-    component: () => import(/* webpackChunkName: 'Page' */ '@pf/src/modules/landing/components/pages/Page.vue')
-  }
 ];
 
 export default landing;

package/src/modules/legal/components/pages/Legal.vue

@@ -40,8 +40,8 @@
 	import Field         from '@pf/src/components/Field/Field.vue'
 	import Button        from '@pf/src/components/Button/Button.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 libs
 	import { computed, watch, onMounted, ref, onBeforeMount } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'

package/src/modules/marketplace/components/layouts/Marketplace.vue

@@ -4,17 +4,17 @@
     	<h2 class="t-semi  mn-b-thin t-left">
     		<span class="">Weed in </span>
 
-    		<p 
+    		<span 
     			v-if="localPosition.city || localPosition.state || localPosition.country"
     			@click="a => { store.globals.state.isOpenLocationPopup = true }" 
-    			class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer "
+    			class="t-main cursor-pointer "
     		>
   				<template v-if="localPosition.city">{{localPosition.city}}, </template>
   				<template v-if="localPosition.state">{{localPosition.state}}, </template>
   				<template v-if="localPosition.country">{{localPosition.country}}</template>
-    		</p>
+    		</span>
 
-    		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="t-semi t-black cursor-pointer hover-t-underline">
+    		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer">
 						The World
     		</span>
     	</h2>
@@ -24,11 +24,17 @@
 			class="mn-b-thin"
 		/> -->
 
-		<!-- Catalog wrapper -->
-		<div class="cols-1 gap-thin pd-thin">
-			<router-view  v-slot="{ Component, route }">
-				<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
-			</router-view>
+		<div class="gap-thin 	cols-2-1_3">
+	 		<FilterProducts
+	 			ref="desktopFilters"
+	 			class="desktop-only "
+	    /> 
+			<!-- Catalog wrapper -->
+			<div class="rows-1 gap-thin">
+				<router-view  v-slot="{ Component, route }">
+					<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
+				</router-view>
+			</div>
 		</div>
 	</div>
 </template>
@@ -41,10 +47,9 @@
 	import { useRoute, useRouter,onBeforeRouteLeave } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
 
-	// Import components
-	import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
 
 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
+	import FilterProducts from '@pf/src/modules/products/components/sections/FilterProducts.vue'
 
 	// Accessing router and store
 	const store = useStore()
@@ -57,6 +62,8 @@
 		country: null
 	});
 
+	const desktopFilters = ref(null)
+
 	function denormalizeUrlParam(param) {
 	  return param
 	    .replace(/-/g, ' ') // Замена дефисов на пробелы
@@ -91,14 +98,24 @@
 	    delivery: query.delivery ? query.delivery.split(',') : [],
 	  };
 
-		store.marketplace.state.filter = newFilterValue;
+		// store.marketplace.state.filter = newFilterValue;
 	}
 
 	if (route.query.sortParam) store.marketplace.state.sort.param = route.query.sortParam
 	if (route.query.sortOrder) store.marketplace.state.sort.order = route.query.sortOrder
 
 	onMounted(async () => {
-	  
+	  let options = {
+      status: 'published'
+    }
+
+		const categoriesFilter = await store.categories.actions.fetchCategories(options)
+
+		console.log(desktopFilters.value.style.display)
+		// store.marketplace.state.filter.options[0].options = categoriesFilter.map(category => ({
+		//   value: category.url,
+		//   label: category.name
+		// }));
 	})
 
 	watch(() => store.marketplace.state.sort, (newSortValue, oldSortValue) => {

package/src/modules/marketplace/components/pages/Catalog.vue

@@ -1,6 +1,7 @@
 <template>
 	<Feed
 		v-model:sort="store.marketplace.state.sort"
+		v-model:filter="store.marketplace.state.filter"
     :search="true"
     :showLoadMore="false"
     :states="{
@@ -25,7 +26,7 @@
     v-slot="{ 
       items 
     }"
-    class="cols-1 gap-thin"
+    class="rows-1 gap-thin"
   >
     <CardOrganization 
 	    v-for="organization in items" 

package/src/modules/marketplace/router/marketplace.js

@@ -35,17 +35,19 @@ const marketplace = [
     ],
 
   },{
-        path: 'products/recommendation',
-        name: 'Product Recommmendation',
-        meta: {
-          title: {
-            en: 'Product Recommmendation',
-            ru: 'Рекомендации продукта'
-          }
-        },
-        component: () => import(/* webpackChunkName: 'Product Recommmendation' */ '@pf/src/modules/products/components/pages/ProductRecommmendation.vue'),
-        props: route => ({ mood: route.query.mood }) 
+    path: 'products/recommendation',
+    name: 'Product Recommmendation',
+    meta: {
+      title: {
+        en: 'Product Recommmendation',
+        ru: 'Рекомендации продукта'
       },
+      header_theme: 'dark',
+      footer_theme: 'dark',
+    },
+    component: () => import(/* webpackChunkName: 'Product Recommmendation' */ '@pf/src/modules/products/components/pages/ProductRecommmendation.vue'),
+    props: route => ({ mood: route.query.mood }) 
+  },
 ];
 
 

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>