@ozdao/martyrs 0.2.564 → 0.2.566

package/src/modules/music/store/player.js

@@ -5,19 +5,23 @@ import { reactive } from 'vue';
 // State
 export const state = reactive({
   currentTrack: null,
+  currentTrackIndex: 0,
   queue: [],
   isPlaying: false,
   volume: 0.7,
   muted: false,
   currentTime: 0,
   duration: 0,
-  repeat: 'none', // 'none', 'all', 'one'
+  repeat: false,
   shuffle: false,
   initialQueue: [], // To keep original order when shuffle is toggled
   audioElement: null,
   audioContext: null,
   listeningPartyId: null,
   syncInProgress: false,
+  showFullPlayer: false,
+  rotationAngle: 0,
+  animationFrameId: null,
 });
 
 // Actions
@@ -53,15 +57,24 @@ export const actions = {
         });
 
         state.audioElement.addEventListener('ended', () => {
-          this.playNext();
+          if (state.repeat) {
+            // Restart текущего трека
+            this.seek(0);
+            state.audioElement.play().catch(e => console.error(e));
+          } else {
+            // Следующий трек
+            this.playNext();
+          }
         });
 
         state.audioElement.addEventListener('play', () => {
           state.isPlaying = true;
+          this.startRotation();
         });
 
         state.audioElement.addEventListener('pause', () => {
           state.isPlaying = false;
+          this.stopRotation();
         });
       }
     }
@@ -165,24 +178,11 @@ export const actions = {
   setQueue(tracks, startIndex = 0) {
     state.queue = [...tracks];
     state.initialQueue = [...tracks];
+    state.currentTrackIndex = startIndex;
 
-    if (startIndex > 0 && startIndex < tracks.length) {
-      // Rearrange queue to start from the selected track
-      const tracksToPlay = state.queue.splice(startIndex);
-      state.queue = [...tracksToPlay, ...state.queue];
-    }
-
-    // If shuffle is on, randomize the queue except the first track
-    if (state.shuffle && state.queue.length > 1) {
-      const firstTrack = state.queue[0];
-      const remainingTracks = state.queue.slice(1);
-      this.shuffleArray(remainingTracks);
-      state.queue = [firstTrack, ...remainingTracks];
-    }
-
-    // Start playing the first track in queue
-    if (state.queue.length > 0) {
-      this.playTrack(state.queue[0]);
+    // Start playing the track at startIndex
+    if (state.queue.length > 0 && state.queue[startIndex]) {
+      this.playTrack(state.queue[startIndex]);
     }
   },
 
@@ -199,6 +199,25 @@ export const actions = {
   removeFromQueue(index) {
     if (index >= 0 && index < state.queue.length) {
       state.queue.splice(index, 1);
+      state.initialQueue.splice(index, 1);
+
+      // Корректируем currentTrackIndex если нужно
+      if (index < state.currentTrackIndex) {
+        // Удалили трек до текущего - сдвигаем индекс назад
+        state.currentTrackIndex--;
+      } else if (index === state.currentTrackIndex) {
+        // Удалили текущий трек - играем следующий (или первый если был последний)
+        if (state.queue.length > 0) {
+          if (state.currentTrackIndex >= state.queue.length) {
+            state.currentTrackIndex = 0;
+          }
+          this.playTrack(state.queue[state.currentTrackIndex]);
+        } else {
+          state.currentTrack = null;
+          state.isPlaying = false;
+        }
+      }
+      // Если удалили трек после текущего - ничего не делаем
     }
   },
 
@@ -216,95 +235,46 @@ export const actions = {
   },
 
   playNext() {
-    if (state.queue.length <= 1) {
-      // Only one track or empty queue
-      if (state.repeat === 'one' || state.repeat === 'all') {
-        // Replay the current track
-        this.seek(0);
-        state.audioElement.play().catch(e => console.error(e));
-      } else {
-        // Stop playback
-        state.isPlaying = false;
-      }
-      return;
-    }
+    if (state.queue.length === 0) return;
 
-    if (state.repeat !== 'one') {
-      // Move to next track
-      state.queue.shift(); // Remove current track from queue
-
-      // If queue is empty after removing current track and repeat is on
-      if (state.queue.length === 0 && state.repeat === 'all') {
-        state.queue = [...state.initialQueue];
-      }
-
-      // Play the next track if available
-      if (state.queue.length > 0) {
-        this.playTrack(state.queue[0]);
-      } else {
-        state.currentTrack = null;
-        state.isPlaying = false;
-      }
+    if (state.shuffle) {
+      // Случайный трек (кроме текущего)
+      let nextIndex;
+      do {
+        nextIndex = Math.floor(Math.random() * state.queue.length);
+      } while (nextIndex === state.currentTrackIndex && state.queue.length > 1);
+      state.currentTrackIndex = nextIndex;
     } else {
-      // Repeat one - just seek to beginning
-      this.seek(0);
-      state.audioElement.play().catch(e => console.error(e));
+      // По порядку (циклически)
+      state.currentTrackIndex = (state.currentTrackIndex + 1) % state.queue.length;
     }
+
+    this.playTrack(state.queue[state.currentTrackIndex]);
   },
 
   playPrevious() {
+    if (state.queue.length === 0) return;
+
     // If we're more than 3 seconds into the track, restart it
     if (state.currentTime > 3) {
       this.seek(0);
       return;
     }
 
-    // Otherwise go to previous track if we have history
-    // Implementation depends on how track history is managed
-    // For simplicity, let's just go back to the beginning of the current track
-    this.seek(0);
+    // Move to previous track (циклически)
+    state.currentTrackIndex = state.currentTrackIndex - 1;
+    if (state.currentTrackIndex < 0) {
+      state.currentTrackIndex = state.queue.length - 1;
+    }
+    this.playTrack(state.queue[state.currentTrackIndex]);
   },
 
   toggleRepeat() {
-    // Cycle through repeat modes: none -> all -> one -> none...
-    if (state.repeat === 'none') {
-      state.repeat = 'all';
-    } else if (state.repeat === 'all') {
-      state.repeat = 'one';
-    } else {
-      state.repeat = 'none';
-    }
+    state.repeat = !state.repeat;
   },
 
   toggleShuffle() {
     state.shuffle = !state.shuffle;
-
-    if (state.shuffle) {
-      // Save the current track
-      const currentTrack = state.queue[0];
-
-      // Shuffle the rest of the queue
-      const remainingTracks = state.queue.slice(1);
-      this.shuffleArray(remainingTracks);
-
-      // Reconstruct queue with current track at the front
-      state.queue = [currentTrack, ...remainingTracks];
-    } else {
-      // Restore original order but keep current track at front
-      if (state.currentTrack) {
-        const currentTrackIndex = state.initialQueue.findIndex(track => track._id === state.currentTrack._id);
-
-        if (currentTrackIndex !== -1) {
-          const tracksToPlay = state.initialQueue.slice(currentTrackIndex);
-          const previousTracks = state.initialQueue.slice(0, currentTrackIndex);
-          state.queue = [...tracksToPlay, ...previousTracks];
-        } else {
-          state.queue = [...state.initialQueue];
-        }
-      } else {
-        state.queue = [...state.initialQueue];
-      }
-    }
   },
 
   shuffleArray(array) {
@@ -398,4 +368,46 @@ export const actions = {
       state.syncInProgress = false;
     }, 1000);
   },
+
+  // Fullscreen player
+  toggleFullPlayer() {
+    state.showFullPlayer = !state.showFullPlayer;
+  },
+
+  // Disk rotation animation
+  rotateDisk() {
+    if (state.isPlaying) {
+      state.rotationAngle = (state.rotationAngle + 1) % 360;
+      state.animationFrameId = requestAnimationFrame(() => this.rotateDisk());
+    }
+  },
+
+  startRotation() {
+    if (!state.animationFrameId && typeof window !== 'undefined') {
+      this.rotateDisk();
+    }
+  },
+
+  stopRotation() {
+    if (state.animationFrameId) {
+      cancelAnimationFrame(state.animationFrameId);
+      state.animationFrameId = null;
+    }
+  },
+
+  // Queue reordering
+  reorderQueue(fromIndex, toIndex) {
+    if (fromIndex >= 0 && fromIndex < state.queue.length && toIndex >= 0 && toIndex < state.queue.length) {
+      const track = state.queue.splice(fromIndex, 1)[0];
+      state.queue.splice(toIndex, 0, track);
+    }
+  },
+
+  // Jump to specific track in queue
+  jumpToTrack(index) {
+    if (index >= 0 && index < state.queue.length) {
+      state.currentTrackIndex = index;
+      this.playTrack(state.queue[index]);
+    }
+  },
 };

package/src/modules/music/store/tracks.js

@@ -233,27 +233,11 @@ export const actions = {
 
   async fetchRelatedTracks(trackUrl) {
     try {
-      // Если есть currentTrack, ищем треки того же артиста
-      if (state.currentTrack && state.currentTrack.artist) {
-        const artistId = typeof state.currentTrack.artist === 'object' 
-          ? state.currentTrack.artist._id 
-          : state.currentTrack.artist;
-          
-        const queryParams = new URLSearchParams();
-        queryParams.append('artist', artistId);
-        queryParams.append('limit', '5');
-        
-        const response = await fetch(`${process.env.API_URL}/api/tracks/read?${queryParams.toString()}`);
-        const tracks = await response.json();
-        
-        // Исключаем текущий трек
-        const relatedTracks = tracks.filter(track => track._id !== state.currentTrack._id);
-        state.relatedTracks = relatedTracks;
-        return relatedTracks;
-      }
-      
-      state.relatedTracks = [];
-      return [];
+      const response = await fetch(`${process.env.API_URL}/api/tracks/related/${trackUrl}`);
+      const relatedTracks = await response.json();
+
+      state.relatedTracks = relatedTracks;
+      return relatedTracks;
     } catch (error) {
       console.error('Error fetching related tracks:', error);
       state.relatedTracks = [];

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

package/src/modules/notifications/notifications.server.js

@@ -1,4 +1,3 @@
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import NotificationsController from './controllers/notifications.controller.js';
 import NotificationLogModel from './models/notification-log.model.js';
 import NotificationPreferenceModel from './models/notification-preference.model.js';
@@ -6,14 +5,13 @@ import NotificationModel from './models/notification.model.js';
 import UserDeviceModel from './models/user-device.model.js';
 import notificationsRoutes from './routes/notifications.routes.js';
 import NotificationService from './services/notification.service.js';
-const { getInstance } = coreabac;
+
 function initializeNotifications(app, db, wss, origins, publicPath) {
   // Set up models in the database object
   db.notification = NotificationModel(db);
   db.userDevice = UserDeviceModel(db);
   db.notificationPreference = NotificationPreferenceModel(db);
   db.notificationLog = NotificationLogModel(db);
-  const abac = getInstance(db);
   // const notificationPolicies = initNotificationPolicies(abac, db);
 
   // Initialize notification service and related background tasks only if wss is provided

package/src/modules/orders/components/elements/FieldSubscribeNewsletter.vue

@@ -49,6 +49,8 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js'
+import locales from '@martyrs/src/modules/orders/locales/index.js'
 
 import FieldBig from '@martyrs/src/components/FieldBig/FieldBig.vue'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
@@ -64,6 +66,9 @@ import IconWhatsapp from '@martyrs/src/modules/icons/socials/whatsapp.vue'
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
 import applications from '@martyrs/src/modules/orders/store/applications.js'
 
+// Регистрируем переводы модуля при использовании компонента
+i18nManager.register('orders', locales)
+
 const store = useStore()
 
 const props = defineProps({

package/src/modules/orders/orders.server.js

@@ -1,4 +1,3 @@
-import CRUD from '@martyrs/src/modules/core/controllers/classes/core.crud.js';
 import FactoryOrder from './controllers/orders.controller.js';
 import ModelApplication from './models/application.model.js';
 import ModelCustomer from './models/customer.model.js';

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -1,7 +1,7 @@
 <template>
-  <div 
+  <div
     class="o-hidden pos-relative cursor-pointer bg-light "
-    @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
+    @click="$router.push('/organizations/' + organization._id)"
   >
     <div class="h-4r flex pos-relative">
 

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

@@ -281,7 +281,7 @@ async function onSubmit() {
 }
 
 function redirectTo() {
-  router.push({ name: "Organization Members", params: { _id: route.params._id } });
+  router.push('/organizations/' + route.params._id + '/members');
 }
 
 async function onDelete() {
@@ -301,7 +301,7 @@ function removeMember(member) {
 }
 
 function redirectDash() {
-  router.replace({ name: "Organization" });
+  router.replace('/organizations/' + route.params._id);
 }
 </script>
 

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

@@ -153,11 +153,11 @@
   async function onDelete() {
     if (route.params._id) {
       await organization.actions.remove(route.params._id)
-      router.push({name: 'Organization'})
+      router.push('/organizations/' + route.params._id)
     }
   }
 
   function redirectTo () {
-    router.replace({ name: 'Organization', params: { _id: organization.state.current._id }});
+    router.replace('/organizations/' + organization.state.current._id);
   }
 </script>

package/src/modules/organizations/policies/organizations.policies.js

@@ -94,20 +94,26 @@ export default (function initializeOrganizationPolicies(abacAccessControl, db) {
     // Получить организацию из контекста
     getOrganizationId(context) {
       const { currentResource, data } = context;
-      
+
       if (currentResource?.owner?.type === 'organization') {
         return String(currentResource.owner.target);
       }
-      if (data?.owner?.type === 'organization') {
-        return String(data.owner.target);
+
+      // Проверяем и body и params
+      const ownerData = data?.body?.owner || data?.params?.owner;
+      if (ownerData?.type === 'organization') {
+        return String(ownerData.target);
       }
-      if (data?.organization) {
-        return String(data.organization);
+
+      const orgId = data?.body?.organization || data?.params?.organization;
+      if (orgId) {
+        return String(orgId);
       }
+
       if (currentResource?.organization) {
         return String(currentResource.organization);
       }
-      
+
       return null;
     }
   };

package/src/modules/organizations/routes/organizations.routes.js

@@ -1,11 +1,9 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import controllerFactory from '../controllers/organizations.controller.js';
-const { getInstance } = coreabac;
+
 export default (function (app, db) {
   const controller = controllerFactory(db);
   const { authJwt } = middlewareFactoryAuth(db);
-  const abac = getInstance(db);
   app.get(
     '/api/organizations',
     [

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

@@ -2,7 +2,7 @@
   <div class="flex-v-center bg-light pd-small radius-small flex-column flex">
     <div class="w-100 flex-v-center flex-nowrap gap-thin flex">
       <img v-if="category.photo" class="i-big radius-small object-fit-contain bg-white" :src="(FILE_SERVER_URL || '') + category.photo"/>
-      <h4 class="my-handle word-break t-truncate w-100 w-max-100 mn-r-auto">{{category.name}}</h4>
+      <h4 class="my-handle t-truncate w-100 w-max-100 mn-r-auto">{{category.name}}</h4>
 
       <router-link
        v-if="access"

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

@@ -10,7 +10,7 @@
 		<!-- Edit Button -->
 		<router-link
 			v-if="access"
-      :to="organization ? { name: 'Organization_ProductEdit', params: { id: organization, product: product._id } } : { name: 'ProductEdit', params: { product: product._id } }"
+      :to="editPath"
       class="
       	z-index-2
         cursor-pointer 
@@ -97,6 +97,7 @@
 <script setup="props">
 	import {computed } from 'vue'
 	import { useI18n }    from 'vue-i18n'
+	import { useRoute } from 'vue-router'
 
 	import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 	import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
@@ -106,6 +107,8 @@
 
 	import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
 
+	const route = useRoute()
+
 	const props = defineProps({
 		product: {
 			type: Object
@@ -122,7 +125,7 @@
 			default: true
 		},
 		user: {
-			type: [Object, String] 
+			type: [Object, String]
 		},
 		type: {
 			type: Object
@@ -130,6 +133,17 @@
 	})
 
   const { t } = useI18n()
+
+	const editPath = computed(() => {
+		if (route.meta.context === 'backoffice') {
+			return `/backoffice/products/${props.product._id}/edit`
+		}
+		if (route.meta.context === 'organization' || props.organization) {
+			const orgId = props.organization || route.params._id
+			return `/organizations/${orgId}/products/${props.product._id}/edit`
+		}
+		return `/products/${props.product._id}/edit`
+	})
 </script>
 
 <style lang="scss">

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

@@ -8,6 +8,7 @@
       </h2>
 
       <router-link
+        v-if="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
         :to="{
           name: route.meta.context === 'backoffice' ? 'BackofficeCategoryAdd' : 'Organization_CategoryAdd',
           params: {
@@ -35,8 +36,9 @@
           state: categories.state
         }"
         :options="{
-          user: auth.state.user._id,
-          tree: true
+          owner: route.params._id,
+          tree: true,
+          limit: 20
         }"
         v-model:sort="sort"
         v-model:items="categories.state.all"
@@ -45,12 +47,13 @@
         }"
         class="rows-1 gap-thin"
       >
-        <Tree 
-          v-if="items" 
-          :items="categories.state.all" 
+        <Tree
+          v-if="items"
+          :items="categories.state.all"
           :state="categories.state.all"
           :parent-id="null"
-          @update="updateCategoriesOrder" 
+          :dragndrop="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
+          @update="updateCategoriesOrder"
           v-slot="{ item }"
         >
           <CardCategory 

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

@@ -192,7 +192,7 @@
   onMounted(async () => {
     emits('page-loading');
     if (route.params.category) {
-      await categories.actions.read({_id: route.params.category})
+      await categories.actions.read({_id: route.params.category, owner: route.params._id})
     } else {
       categories.actions.clean() // Adjusted based on the new store's method to reset the category state
     }
@@ -283,11 +283,15 @@
   }
 
   function redirectTo () {
+    const routeName = route.meta.context === 'organization'
+      ? 'Organization_Categories'
+      : 'BackofficeCategories'
+
     router.push({
-      name: 'Categories', 
-      params: { 
+      name: routeName,
+      params: {
         _id: route.params._id
-      } 
+      }
     })
   }
 </script>

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

@@ -11,11 +11,7 @@
         <!-- Edit Button -->
         <router-link
           v-if="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses, auth.state.access.roles)"
-          :to="
-            route.params._id 
-            ? { name: 'Organization_ProductEdit', params: { id: route.params._id, product: product._id } } 
-            : { name: 'ProductEdit', params: { product: product._id } }
-          "
+          :to="editPath"
           class="
             z-index-2
             cursor-pointer 
@@ -147,6 +143,16 @@ const { returnCurrency, hasAccess } = useGlobalMixins()
 const product = computed(() => products.state.current)
 const productImages = computed(() => products.state.current.images || [])
 
+const editPath = computed(() => {
+	if (route.meta.context === 'backoffice') {
+		return `/backoffice/products/${product.value._id}/edit`
+	}
+	if (route.meta.context === 'organization') {
+		return `/organizations/${route.params._id}/products/${product.value._id}/edit`
+	}
+	return `/products/${product.value._id}/edit`
+})
+
 // Состояние для отслеживания текущих изображений (товара или варианта)
 const currentImages = ref([])
 // Выбранный вариант товара

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

@@ -37,13 +37,7 @@
 
 			<IconEdit
 				v-if="accesses && hasAccess(route.params._id, 'products', 'edit', accesses)"
-				@click="$router.push({
-					name: route.meta.context === 'backoffice' ? 'BackofficeProductEdit' : 'Organization_ProductEdit',
-					params: {
-						_id: product.owner.target,
-						product: product._id
-					}
-				})"
+				@click="$router.push(editPath)"
 				class="pos-absolute pos-t-regular pos-r-regular i-medium t-transp"
 			/>
 
@@ -183,6 +177,16 @@ const images = computed(() => {
   return props.product.images
 })
 
+const editPath = computed(() => {
+	if (route.meta.context === 'backoffice') {
+		return `/backoffice/products/${props.product._id}/edit`
+	}
+	if (route.meta.context === 'organization') {
+		return `/organizations/${props.product.owner.target}/products/${props.product._id}/edit`
+	}
+	return `/products/${props.product._id}/edit`
+})
+
 const tabProduct = ref('description')
 
 const text = {