@ozdao/martyrs 0.2.564 → 0.2.565

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

@@ -0,0 +1,363 @@
+<template>
+	 <div class="cols-2-1_3 z-index-3 pos-relative radius-big">
+
+		<div class="o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative">
+			<div class="w-100 o-y-scroll h-100">
+				<!-- Categories -->
+				<div class="mn-b-medium" v-if="currentCategories.length > 0">
+					<h4 class="mn-b-small">
+						{{ route.params.categoryPath ? 'Subcategories' : 'Categories' }}
+					</h4>
+					<div class="gap-micro">
+						<div
+							v-for="category in currentCategories"
+							:key="category._id"
+							@click="selectCategory(category)"
+							class="pd-small radius-small cursor-pointer hover-bg-light transition-all"
+						>
+							{{ category.name }}
+						</div>
+					</div>
+				</div>
+
+				<!-- Location Filter -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Location</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-medium"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Field
+								v-model="searchLocation"
+								placeholder="Search location..."
+								type="text"
+								class="w-100 bg-light pd-small radius-small mn-b-small"
+							/>
+							<Checkbox 
+								v-for="location in locationOptions"
+								:key="location"
+								v-model:radio="selectedLocation"
+								:label="location"
+								:value="location"
+								mode="radio"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Delivery Options -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Delivery Options</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-medium"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Checkbox 
+								v-for="option in deliveryOptions"
+								:key="option.value"
+								v-model:checkbox="selectedDeliveryOptions"
+								:label="option.label"
+								:value="option.value"
+								mode="checkbox"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Payment Options -->
+				<Spoiler 
+					class="o-hidden mn-b-medium"
+					:status="true"
+				>
+					<template #header="{ isOpen }">
+						<div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
+							<h4 class="w-100">Payment Options</h4>
+							<div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
+								<IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-medium"/>
+							</div>
+						</div>
+					</template>
+
+					<template #content>
+						<div class="mn-t-small">
+							<Checkbox 
+								v-for="option in paymentOptions"
+								:key="option.value"
+								v-model:checkbox="selectedPaymentOptions"
+								:label="option.label"
+								:value="option.value"
+								mode="checkbox"
+								class="mn-b-micro"
+							/>
+						</div>
+					</template>
+				</Spoiler>
+
+				<!-- Clear Filters Button -->
+				<button 
+					@click="clearFilters"
+					class="bg-main w-100 button mn-t-medium"
+				>
+					Clear Filters
+				</button>
+				</div>
+		</div>
+
+		<!-- Catalog wrapper -->
+		<div class="pd-thin">
+			<header class="pd-medium radius-medium bg-light mn-b-thin">
+	    	<h2 class="">
+	    		<span class="">Weed Deliveries in </span>
+
+	    		<span 
+	    			v-if="localPosition.city || localPosition.state || localPosition.country"
+	    			@click="a => { core.state.isOpenLocationPopup = true }" 
+	    			class="t-main t-semi 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>
+	    		</span>
+
+	    		<span v-else @click="a => { core.state.isOpenLocationPopup = true }"  class="t-main t-semi cursor-pointer">The World</span>
+	    	</h2>
+			</header>
+
+			<div class="rows-1">
+				<router-view  v-slot="{ Component, route }">
+					<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
+				</router-view>
+			</div>
+		</div>
+	</div>
+</template>
+
+
+<script setup="props">
+	// Import libs
+	import { computed, onMounted, watch, ref } from 'vue'
+	import { useRoute, useRouter,onBeforeRouteLeave } from 'vue-router'
+	import { useI18n } from 'vue-i18n'
+
+	import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
+	import Field from "@martyrs/src/components/Field/Field.vue"
+	import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue"
+	import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
+
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+  import * as categories from '@martyrs/src/modules/products/store/categories.js';
+	const core = useStore()
+
+
+	import * as marketplace from '../../store/marketplace';
+
+	// Accessing router and store
+	const route = useRoute()
+	const router = useRouter()
+
+	const localPosition = ref({
+		city: null,
+		state: null,
+		country: null
+	});
+
+	const desktopFilters = ref(null)
+
+	// Categories
+	const currentCategories = ref([]);
+	const searchLocation = ref('');
+	const selectedLocation = ref('All');
+	const locationOptions = ref(['All', 'Phuket', 'Bangkok', 'Chiang Mai', 'Pattaya']);
+
+	// Delivery options
+	const deliveryOptions = ref([
+		{ label: 'Pickup', value: 'pickup' },
+		{ label: 'Delivery', value: 'delivery' },
+		{ label: 'Dine-in', value: 'dinein' }
+	]);
+	const selectedDeliveryOptions = ref([]);
+
+	// Payment options
+	const paymentOptions = ref([
+		{ label: 'Cash', value: 'cash' },
+		{ label: 'Card', value: 'card' },
+		{ label: 'Crypto', value: 'crypto' },
+		{ label: 'Bank Transfer', value: 'transfer' }
+	]);
+	const selectedPaymentOptions = ref([]);
+
+	const selectCategory = (category) => {
+		// Implementation for category selection
+		console.log('Category selected:', category);
+	};
+
+	const clearFilters = () => {
+		selectedLocation.value = 'All';
+		selectedDeliveryOptions.value = [];
+		selectedPaymentOptions.value = [];
+		searchLocation.value = '';
+	};
+
+	function denormalizeUrlParam(param) {
+	  return param
+	    .replace(/-/g, ' ') // Замена дефисов на пробелы
+	    .replace(/\b\w/g, l => l.toUpperCase()); // Преобразование первой буквы каждого слова в заглавную
+	}
+
+	function normalizeUrlParam(param) {
+	  return param
+	    .toLowerCase()
+	    .replace(/ /g, '-')
+	    .replace(/[^a-z0-9-]/g, '');
+	}
+
+	if (route.params) {
+    // Загружаем новые значения из параметров маршрута в состояние
+    let newState = {
+      country: denormalizeUrlParam(route.params.country),
+      state: denormalizeUrlParam(route.params.state),
+      city: denormalizeUrlParam(route.params.city),
+    };
+
+	  // Обновляем глобальное состояние
+	  localPosition.value = newState;
+	}
+
+	if (route.query) {
+	 	const query = route.query;
+
+		marketplace.state.filter.selected.categories = query.categories ? query.categories.split(',') : [];
+		marketplace.state.filter.selected.prices = query.prices ? query.prices.split(',') : [];
+		marketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];
+	}
+
+	if (route.query.sortParam) marketplace.state.sort.param = route.query.sortParam
+	if (route.query.sortOrder) marketplace.state.sort.order = route.query.sortOrder
+
+	onMounted(async () => {
+	  let options = {
+      status: 'published',
+      rootOnly: true
+    }
+
+    let categoriesFilter = await categories.actions.read(options);
+
+    categoriesFilter = categoriesFilter.map(category => ({
+      value: category._id,
+      label: category.name
+    }));
+
+    const index = marketplace.state.filter.options.findIndex(option => option.value === 'categories');
+
+    const categoryOption = {
+      title: 'Categories',
+      value: 'categories',
+      options: categoriesFilter
+    };
+
+    if (index !== -1) {
+        marketplace.state.filter.options[index] = categoryOption;
+    } else {
+        marketplace.state.filter.options.unshift(categoryOption);
+    }
+	})
+
+	watch(() => marketplace.state.sort, (newSortValue, oldSortValue) => {
+		let query = { ...route.query}
+		
+		query.sortParam = newSortValue.param
+		query.sortOrder = newSortValue.order
+	  
+	  // replace the current route
+	  router.replace({ query });
+	}, { deep: true });
+
+
+	watch(() => marketplace.state.filter.selected, (newFilterValue, oldFilterValue) => {
+	  // Переводим фильтр в формат query
+	  const query = { ...route.query };
+
+	  // Удаляем старые значения фильтра из query
+	  Object.keys(oldFilterValue).forEach(key => {
+	    if (query[key]) {
+	      delete query[key];
+	    }
+	  });
+
+	  // Добавляем новые значения фильтра в query
+	  const newQueryValues = Object.fromEntries(
+	    Object.entries(newFilterValue)
+	      .filter(([key, value]) => Array.isArray(value) && value.length > 0)
+	      .map(([key, value]) => [key, value.join(',')])
+	  );
+
+	  delete query.options;
+	  Object.assign(query, newQueryValues);
+
+	  // Обновляем маршрут с новым query
+	  router.replace({ query });
+	}, { deep: true })
+
+	// watch(() => core.state.position, (newPosition) => {
+	//   // get the current route
+	//   const currentRoute = { ...router.currentRoute.value };
+	  
+	//   // create new parameters based on globals state position
+	//   let newParams = {
+	//     country: normalizeUrlParam(newPosition.country),
+	//     state: normalizeUrlParam(newPosition.state),
+	//     city: normalizeUrlParam(newPosition.city),
+	//   };
+	  
+	//   // update route params
+	//   currentRoute.params = newParams;
+	  
+	//   // replace the current route
+	//   router.replace(currentRoute);
+	// }, { deep: true });
+
+  const text = {
+    locale: 'en',
+    messages: {
+      en: {
+	     	meta: {
+          title: "Marketplace – Shop Our Wide Selection of Quality Weed for Delivery",
+          description: "Browse our marketplace of top-grade weed strains and choose from a variety of delivery options. Order now and have your favorite strains delivered straight to your door. Safe, fast, and reliable.",
+        }
+      },
+      ru: {
+	      meta: {
+          title: "Маркетплейс – Выбирайте из нашего ассортимента качественной травки для доставки",
+          description: "Маркетплейс – Изучите наши продукты высокого качества и выбирайте из различных вариантов доставки. Закажите сейчас и получите свои любимые сорта на дом. Безопасно, быстро и надежно.",
+        }
+      }
+    }
+  }
+
+ 	const { t } = useI18n(text)
+</script>
+
+<style lang="scss">
+
+
+</style>

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

@@ -0,0 +1,73 @@
+<template>
+	<Feed
+		v-model:sort="marketplace.state.sort"
+		v-model:filter="marketplace.state.filter"
+    :search="true"
+    :showLoadMore="false"
+    :states="{
+      empty: {
+        title: 'No Shops Found',
+        description: 'Currently, there are no shops.'
+      },
+    }"
+    :store="{
+      read: (options) => organization.actions.read(options)
+    }"
+    :options="{
+      country: route.params.country,
+	    state: route.params.state,
+	    city: route.params.city,
+	    categories: route.query.categories,
+	    prices: route.query.prices,
+	    delivery: route.query.delivery,
+	    location: core.state.position?.location,
+	    lookup: ['products','spots'],
+	    contain: ['products'],
+    }"
+    v-slot="{ 
+      items 
+    }"
+    class="rows-1 gap-thin"
+  >
+    <CardOrganization 
+	    v-for="organization in items" 
+	    :key="organization._id"
+	    :organization="organization"
+	    :showRating="true"
+	    :showFollowers="false"
+	    :showProducts="true"
+	    class="bg-light w-100 o-hidden radius-medium pd-small "
+	  />
+  </Feed>
+</template>
+
+<script setup>
+	import { computed,reactive,ref, onMounted,watch  } from 'vue'
+	import { useRoute } from 'vue-router'
+
+	import Feed from '@martyrs/src/components/Feed/Feed.vue'
+	
+	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+	const core = useStore()
+
+	import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
+
+	import * as marketplace from '../../store/marketplace';
+	
+	const route = useRoute()
+
+	onMounted(() => {
+		// Добавление Google Analytics event на открытие маркетплейса
+		if (typeof gtag === 'function') {
+			gtag('event', 'view_marketplace', {
+				location: core.state.position?.location || 'unknown',
+				page_path: window.location.pathname,
+				marketplace_id: route.params.id || 'main',
+			});
+		}
+	})
+</script>
+
+<style lang="scss">
+</style>

package/src/modules/music/controllers/stream.controller.js

@@ -1,4 +1,4 @@
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
 import fs from 'fs';
 import path from 'path';

package/src/modules/music/music.server.js

@@ -1,4 +1,4 @@
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
 import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
 

package/src/modules/music/policies/music.policies.js

@@ -10,8 +10,9 @@ export default (function initializeMusicPolicies(abacAccessControl) {
     // For create actions, verify ownership
     if (action === 'create') {
       // Ensure that creator.target matches the authenticated user
-      if (context.data.creator && context.data.creator.target) {
-        return context.data.creator.target.toString() === user.toString();
+      const creator = context.data.body?.creator;
+      if (creator?.target) {
+        return creator.target.toString() === user.toString();
       }
       return false;
     }

package/src/modules/music/router/library.router.js

@@ -0,0 +1,26 @@
+export function getRoutes(options = {}) {
+  const route = options.route || 'Home';
+  const routes = [];
+
+  routes.push({
+    parentName: route,
+    config: {
+      basePath: 'music',
+      routes: [
+        {
+          path: 'library',
+          name: 'music-library',
+          component: () => import(/* webpackChunkName: 'music-library' */ '../components/pages/MusicLibrary.vue'),
+          meta: {
+            title: 'My Library',
+            requiresAuth: true,
+          },
+        },
+      ],
+    },
+  });
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/music/router/music.router.js

@@ -0,0 +1,176 @@
+function createArtistRoutes() {
+  return [
+    {
+      path: 'artists/create',
+      name: 'artist-create',
+      component: () => import(/* webpackChunkName: 'music-artist-create' */ '../components/pages/ArtistCreate.vue'),
+      meta: {
+        title: 'Create Artist',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'artists/:url/edit',
+      name: 'artist-edit',
+      component: () => import(/* webpackChunkName: 'music-artist-edit' */ '../components/pages/ArtistEdit.vue'),
+      props: true,
+      meta: {
+        title: 'Edit Artist',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'artists/:url',
+      name: 'artist',
+      component: () => import(/* webpackChunkName: 'music-artist' */ '../components/pages/Artist.vue'),
+      props: true,
+      meta: {
+        title: 'Artist',
+      },
+    },
+  ];
+}
+
+function createAlbumRoutes() {
+  return [
+    {
+      path: 'albums/create',
+      name: 'album-create',
+      component: () => import(/* webpackChunkName: 'music-album-create' */ '../components/pages/AlbumCreate.vue'),
+      meta: {
+        title: 'Create Album',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'albums/:url/edit',
+      name: 'album-edit',
+      component: () => import(/* webpackChunkName: 'music-album-edit' */ '../components/pages/AlbumEdit.vue'),
+      props: true,
+      meta: {
+        title: 'Edit Album',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'albums/:url',
+      name: 'album',
+      component: () => import(/* webpackChunkName: 'music-album' */ '../components/pages/Album.vue'),
+      props: true,
+      meta: {
+        title: 'Album',
+      },
+    },
+  ];
+}
+
+function createTrackRoutes() {
+  return [
+    {
+      path: 'tracks/create',
+      name: 'track-create',
+      component: () => import(/* webpackChunkName: 'music-track-create' */ '../components/pages/TrackCreate.vue'),
+      meta: {
+        title: 'Create Track',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'tracks/:url/edit',
+      name: 'track-edit',
+      component: () => import(/* webpackChunkName: 'music-track-edit' */ '../components/pages/TrackEdit.vue'),
+      props: true,
+      meta: {
+        title: 'Edit Track',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'tracks/:url',
+      name: 'track',
+      component: () => import(/* webpackChunkName: 'music-track' */ '../components/pages/Track.vue'),
+      props: true,
+      meta: {
+        title: 'Track',
+      },
+    },
+  ];
+}
+
+function createPlaylistRoutes() {
+  return [
+    {
+      path: 'playlists/create',
+      name: 'playlist-create',
+      component: () => import(/* webpackChunkName: 'music-playlist-create' */ '../components/pages/PlaylistCreate.vue'),
+      meta: {
+        title: 'Create Playlist',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'playlists/:url/edit',
+      name: 'playlist-edit',
+      component: () => import(/* webpackChunkName: 'music-playlist-edit' */ '../components/pages/PlaylistEdit.vue'),
+      props: true,
+      meta: {
+        title: 'Edit Playlist',
+        requiresAuth: true,
+      },
+    },
+    {
+      path: 'playlists/:url',
+      name: 'playlist',
+      component: () => import(/* webpackChunkName: 'music-playlist' */ '../components/pages/Playlist.vue'),
+      props: true,
+      meta: {
+        title: 'Playlist',
+      },
+    },
+  ];
+}
+
+function buildMusicRoutes() {
+  return [
+    {
+      path: '',
+      name: 'music-home',
+      component: () => import(/* webpackChunkName: 'music-home' */ '../components/pages/MusicHome.vue'),
+      meta: {
+        title: 'Music Home',
+      },
+    },
+    {
+      path: 'search',
+      name: 'music-search',
+      component: () => import(/* webpackChunkName: 'music-search' */ '../components/pages/SearchResults.vue'),
+      meta: {
+        title: 'Search Music',
+      },
+    },
+    ...createArtistRoutes(),
+    ...createAlbumRoutes(),
+    ...createTrackRoutes(),
+    ...createPlaylistRoutes(),
+  ];
+}
+
+export function getRoutes(options = {}) {
+  const route = options.route || 'Home';
+  const routes = [];
+
+  routes.push({
+    parentName: route,
+    config: {
+      basePath: options.basePath || 'music',
+      meta: {
+        player: options.playerComponent || (() => import(/* webpackChunkName: 'music-bottom-player' */ '../components/layouts/MusicBottomPlayer.vue')),
+      },
+      routes: buildMusicRoutes(options),
+    },
+  });
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/notifications/components/elements/NotificationBadge.vue

@@ -83,17 +83,16 @@ const props = defineProps({
 // Get router and notification functionality
 const router = useRouter();
 
-// Check if notifications module is loaded
-const useNotifications = inject('useNotifications');
-
-// Provide fallback values if module is not loaded
-const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = useNotifications ? useNotifications() : {
+// Check if notifications module is loaded, provide fallback if not
+const useNotifications = inject('useNotifications', () => ({
   notifications: ref([]),
   unreadCount: ref(0),
   loading: ref(false),
   markAllAsRead: () => {},
   getNotifications: () => {}
-};
+}));
+
+const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = useNotifications();
 
 // Local state
 const isOpen = ref(false);