@ozdao/martyrs 0.2.492 → 0.2.494

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

@@ -97,7 +97,11 @@ export const actions = {
     }
 
     // Log play via WebSocket if connected
+    console.log('Player: Attempting to log play event for track:', track._id);
+    console.log('Player: WebSocket connected?', globalWebSocket.isSocketConnected());
+    
     if (globalWebSocket.isSocketConnected()) {
+      console.log('Player: Sending startPlaying event via WebSocket');
       globalWebSocket.send({
         module: 'music-streaming',
         action: 'startPlaying',
@@ -107,6 +111,8 @@ export const actions = {
           deviceInfo: navigator.userAgent,
         },
       });
+    } else {
+      console.log('Player: WebSocket not connected, play count will not be incremented');
     }
   },
 

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

@@ -13,6 +13,7 @@ export const state = reactive({
   featured: [],
   userTracks: [],
   currentTrack: null,
+  relatedTracks: [],
   isLoading: false,
   loadingPopular: false,
   loadingRecent: false,
@@ -229,4 +230,34 @@ export const actions = {
       return [];
     }
   },
+
+  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 [];
+    } catch (error) {
+      console.error('Error fetching related tracks:', error);
+      state.relatedTracks = [];
+      return [];
+    }
+  },
 };

package/src/modules/music/websocket/streaming.handler.js

@@ -5,9 +5,11 @@ export default (function (db) {
     // Handle WebSocket messages for music streaming
     handleStreamingMessage: async (ws, message) => {
       try {
+        console.log('StreamingHandler: Received message:', { action: message.action, data: message.data });
         const { action, data } = message;
         switch (action) {
           case 'startPlaying':
+            console.log('StreamingHandler: Processing startPlaying event for track:', data.trackId, 'user:', ws.userId);
             // Log play event
             if (ws.userId && data.trackId) {
               await db.playHistory.create({
@@ -18,8 +20,12 @@ export default (function (db) {
                 playedFrom: data.from || 'other',
                 contextId: data.contextId || null,
               });
+              console.log('StreamingHandler: Created play history record');
+              
               // Increment play count
-              await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } });
+              const trackUpdate = await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } }, { new: true });
+              console.log('StreamingHandler: Updated track playCount to:', trackUpdate?.playCount);
+              
               // Acknowledge
               ws.send(
                 JSON.stringify({

package/src/modules/rents/controllers/services/rents.services.js

@@ -21,8 +21,8 @@ const queryValidatorConfig = {
   skip: { rule: 'optional', validator: Validator.schema().number().integer().min(0), default: 0 },
   limit: {
     rule: 'optional',
-    validator: Validator.schema().number().integer().min(1).max(100),
-    default: 10,
+    validator: Validator.schema().number().integer().min(1).max(1000),
+    default: 1000,
   },
   productId: { rule: 'optional', validator: Validator.schema().string(), default: null },
   variantId: { rule: 'optional', validator: Validator.schema().string(), default: null },

package/src/modules/rents/views/components/pages/Gant/GanttBar.vue

@@ -6,7 +6,7 @@
     @click="$emit('click')"
   >
     <div class="pd-micro t-micro t-white t-truncate">
-      {{ bar.item.title || bar.item.name || 'Task' }}
+      {{ bar.item.productDetails.name || 'Task' }}
     </div>
   </div>
 </template>
@@ -25,9 +25,10 @@ const emit = defineEmits(['click'])
 const barClass = computed(() => {
   const statusMap = {
     active: 'bg-main',
-    completed: 'bg-second',
+    completed: 'bg-green',
     canceled: 'bg-red',
-    default: 'bg-gray'
+    pending : 'bg-grey',
+    default: 'bg-second'
   }
   
   return statusMap[props.bar.status] || statusMap.default

package/src/modules/rents/views/components/pages/Gant/GanttChart.vue

@@ -7,18 +7,19 @@
       @update:view="$emit('update:view', $event)"
       @update:date="$emit('update:date', $event)"
       @today="$emit('today')"
+      @load-more="$emit('load-more', $event)"
     />
     
     <div 
-      class="gantt-container scroller o-scroll bg-white radius-small br-solid br-1px br-grey-transp"
+      class="gantt-container scroller o-scroll bg-white radius-small br-solid br-1px br-black-transp-10"
       ref="container"
       @scroll="handleScroll"
     >
       <div class="gantt-content">
         <!-- Header -->
-        <div class="gantt-header pos-sticky top-0 z-index-2 bg-white br-b br-solid br-grey-transp">
+        <div class="gantt-header pos-sticky top-0 z-index-2 bg-white br-b br-solid br-black-transp-10">
           <div class="flex">
-            <div class="gantt-product-col pos-sticky left-0 z-index-3 bg-light pd-small br-r br-solid br-grey-transp">
+            <div class="gantt-product-col pos-sticky left-0 z-index-3 bg-light pd-small br-r br-solid br-black-transp-10">
               Product
             </div>
             
@@ -26,7 +27,7 @@
               <div
                 v-for="(cell, i) in visibleCells"
                 :key="cell.key"
-                class="gantt-cell br-r br-solid br-grey-transp t-center pd-small"
+                class="gantt-cell br-r br-solid br-black-transp-10 t-center pd-small"
                 :class="getCellClass(cell)"
                 :style="{ width: cellWidth + 'px' }"
               >
@@ -41,11 +42,11 @@
           <div 
             v-for="(group, i) in groups" 
             :key="group.key" 
-            class="gantt-row flex br-b br-solid br-grey-transp"
+            class="gantt-row flex br-b br-solid br-black-transp-10"
             :class="i % 2 === 0 ? 'bg-light-transp' : ''"
             :style="{ height: rowHeight + 'px' }"
           >
-            <div class="gantt-product-col pos-sticky left-0 z-index-1 bg-white pd-small br-r br-solid br-grey-transp">
+            <div class="gantt-product-col pos-sticky left-0 z-index-1 bg-white pd-small br-r br-solid br-black-transp-10">
               <div class="t-medium mn-b-micro">{{ group.title }}</div>
               <div class="t-micro" :class="statusClass(group)">{{ group.status }}</div>
             </div>
@@ -56,7 +57,7 @@
                 <div
                   v-for="cell in visibleCells"
                   :key="cell.key + '-bg'"
-                  class="gantt-cell h-100 br-r br-solid br-grey-transp"
+                  class="gantt-cell h-100 br-r br-solid br-black-transp-10"
                   :class="getCellClass(cell)"
                   :style="{ width: cellWidth + 'px' }"
                 />
@@ -128,7 +129,6 @@ const emit = defineEmits([
 // State
 const container = ref(null)
 const scrollLeft = ref(0)
-const loadPromise = ref(null)
 
 // Cell width
 const cellWidth = computed(() => {
@@ -200,19 +200,24 @@ const visibleCells = computed(() => {
 // Cache for bars calculation
 const barsCache = new WeakMap()
 
+// Helper function to get nested property value
+const getNestedValue = (obj, path) => {
+  return path.split('.').reduce((current, key) => current?.[key], obj)
+}
+
 // Groups
 const groups = computed(() => {
   const map = new Map()
   
   props.items.forEach(item => {
-    const key = item[props.groupBy] || 'Ungrouped'
+    const key = getNestedValue(item, props.groupBy) || 'Ungrouped'
     
     if (!map.has(key)) {
       map.set(key, {
         key,
         title: key,
         items: [],
-        status: item[props.statusKey]
+        status: getNestedValue(item, props.statusKey)
       })
     }
     
@@ -271,8 +276,8 @@ const getBars = (group) => {
   
   group.items.forEach(item => {
     try {
-      const start = item[props.startKey]
-      const end = item[props.endKey]
+      const start = getNestedValue(item, props.startKey)
+      const end = getNestedValue(item, props.endKey)
       
       if (!start || !end) return
       
@@ -280,12 +285,22 @@ const getBars = (group) => {
       const e = end instanceof Date ? new Date(end) : dayjs(end).toDate()
       
       if (isNaN(s.getTime()) || isNaN(e.getTime())) {
-        console.warn(`Invalid dates for item ${item[props.idKey]}:`, { start, end })
+        console.warn(`Invalid dates for item ${getNestedValue(item, props.idKey)}:`, { start, end })
         return
       }
     
+    console.log('Processing item:', {
+      id: getNestedValue(item, props.idKey),
+      start: s,
+      end: e,
+      dateRange: props.dateRange
+    })
+    
     // Skip if completely outside visible range
-    if (e < props.dateRange.start || s > props.dateRange.end) return
+    if (e < props.dateRange.start || s > props.dateRange.end) {
+      console.log('Item skipped - outside visible range')
+      return
+    }
     
     // Calculate position
     let left = 0
@@ -410,18 +425,19 @@ const getBars = (group) => {
     }
     
       result.push({
-        key: `${item[props.idKey]}-${s.getTime()}`,
+        key: `${getNestedValue(item, props.idKey)}-${s.getTime()}`,
         item,
         left,
         width,
         row,
-        status: item[props.statusKey] || 'default'
+        status: getNestedValue(item, props.statusKey) || 'default'
       })
     } catch (error) {
-      console.error(`Error processing item ${item[props.idKey]}:`, error)
+      console.error(`Error processing item ${getNestedValue(item, props.idKey)}:`, error)
     }
   })
   
+  console.log('Final bars result:', result)
   return result
 }
 
@@ -463,36 +479,16 @@ const throttle = (fn, delay) => {
 }
 
 // Scroll handling
-const handleScroll = throttle(async (event) => {
+const handleScroll = (event) => {
   if (!container.value) return
   
   const el = event.target
   scrollLeft.value = el.scrollLeft
-  
-  const scrollWidth = el.scrollWidth
-  const clientWidth = el.clientWidth
-  const currentScrollLeft = el.scrollLeft
-  
-  const threshold = 100
-  
-  if (currentScrollLeft < threshold && !props.loading && !loadPromise.value) {
-    loadPromise.value = emit('load-more', 'backward')
-    if (loadPromise.value?.then) {
-      await loadPromise.value
-      loadPromise.value = null
-    }
-  } else if (scrollWidth - (currentScrollLeft + clientWidth) < threshold && !props.loading && !loadPromise.value) {
-    loadPromise.value = emit('load-more', 'forward')
-    if (loadPromise.value?.then) {
-      await loadPromise.value
-      loadPromise.value = null
-    }
-  }
-}, 100)
+}
 
 // Cleanup
 onUnmounted(() => {
-  handleScroll.cancel()
+  // No cleanup needed
 })
 
 // Center view on specific date
@@ -543,6 +539,12 @@ watch(() => props.view, () => {
   centerOnDate(props.date)
 })
 
+// Watch for date changes (e.g., when Today button is clicked)
+watch(() => props.date, (newDate) => {
+  // Center on the new date, especially important for hours view
+  centerOnDate(newDate)
+})
+
 watch(() => props.dateRange, () => {
   // Reset scroll position when date range changes significantly
   if (container.value) {

package/src/modules/rents/views/components/pages/Gant/GanttToolbar.vue

@@ -21,7 +21,7 @@
         <Dropdown 
           :label="dateLabel"
           align="left"
-          class="pos-relative h-100 bg-white radius-small pd-thin"
+          class="pos-relative z-index-3 h-100 bg-white radius-small pd-thin"
         >
           <Calendar 
             v-model:date="selectedDate"
@@ -153,6 +153,8 @@ const updateDate = (newSelectedDate) => {
   if (newSelectedDate) {
     const newDate = new Date(newSelectedDate)
     emit('update:date', newDate)
+    // Emit load-more event to trigger data loading for new date
+    emit('load-more', 'refresh')
   }
 }
 

package/src/modules/rents/views/components/pages/Rents.vue

@@ -20,6 +20,7 @@
 
     <Feed
       :search="true"
+      :keepSlotVisible="true"
       :states="{
         empty: {
           title: 'No Rents Found',
@@ -28,9 +29,9 @@
       }"
       :store="{ read: (options) => rents.actions.read(options) }"
       :options="{
-        limit: 15,
         owner: route.params._id,
-        ...(tab !== 'all' && { status: tab })
+        startDate: dateRange.start.toISOString(),
+        endDate: dateRange.end.toISOString()
       }"
       v-slot="{ items }"
     > 
@@ -38,13 +39,18 @@
         v-model:view="view"
         v-model:date="date"
         v-model:dateRange="dateRange"
-        :items="sampleData"
+        :items="items"
         :loading="loading"
+        :title-key="'productDetails.name'"
+        :start-key="'startDate'"
+        :end-key="'endDate'"
+        :status-key="'status'"
+        :id-key="'_id'"
+        :group-by="'productDetails.name'"
         @load-more="handleLoadMore"
         @item-click="handleItemClick"
         @today="handleToday"
       />
-      {{items}}
 
      <!--  <CardRent
         v-else
@@ -77,45 +83,6 @@ const router = useRouter();
 
 const isCalendarView = ref(true);
 
-// Sample data
-const sampleData = ref([
-  {
-    id: 2,
-    title: 'Product A',
-    startDate: dayjs().add(1, 'days').toDate(),
-    endDate: dayjs().add(5, 'days').toDate(),
-    status: 'active'
-  },
-  {
-    id: 3,
-    title: 'Product B',
-    startDate: dayjs().subtract(1, 'days').toDate(),
-    endDate: dayjs().add(2, 'days').toDate(),
-    status: 'completed'
-  },
-  {
-    id: 4,
-    title: 'Product C',
-    startDate: dayjs().toDate(),
-    endDate: dayjs().add(4, 'days').toDate(),
-    status: 'canceled'
-  },
-  // Additional test data for hour view
-  {
-    id: 5,
-    title: 'Product D',
-    startDate: dayjs().add(2, 'days').add(8, 'hours').toDate(),
-    endDate: dayjs().add(2, 'days').add(16, 'hours').toDate(),
-    status: 'active'
-  },
-  {
-    id: 6,
-    title: 'Product E',
-    startDate: dayjs().add(1, 'days').add(14, 'hours').toDate(),
-    endDate: dayjs().add(2, 'days').add(10, 'hours').toDate(),
-    status: 'completed'
-  }
-])
 
 // Set initial date range - current month plus 15 days before and 45 days after
 const view = ref('days')
@@ -127,9 +94,10 @@ const dateRange = computed(() => {
   
   switch (view.value) {
     case 'hours':
+      // Show only the current day in hours view
       return {
-        start: d.subtract(1, 'days').startOf('day').toDate(),
-        end: d.add(6, 'days').endOf('day').toDate()
+        start: d.startOf('day').toDate(),
+        end: d.endOf('day').toDate()
       }
       
     case 'days':
@@ -158,14 +126,44 @@ const handleLoadMore = async (direction) => {
   
   loading.value = true
   
-  // Simulate API call
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      // Add more items if needed
-      loading.value = false
-      resolve()
-    }, 1000)
-  })
+  try {
+    // Only update date if it's navigation (not refresh)
+    if (direction !== 'refresh') {
+      const d = dayjs(date.value)
+      let newDate
+      
+      switch (view.value) {
+        case 'hours':
+          newDate = direction === 'forward' 
+            ? d.add(1, 'day').toDate()
+            : d.subtract(1, 'day').toDate()
+          break
+        case 'days':
+          newDate = direction === 'forward'
+            ? d.add(1, 'month').toDate()
+            : d.subtract(1, 'month').toDate()
+          break
+        case 'weeks':
+          newDate = direction === 'forward'
+            ? d.add(1, 'month').toDate()
+            : d.subtract(1, 'month').toDate()
+          break
+      }
+      
+      date.value = newDate
+    }
+    
+    // Load data for the current date range
+    await rents.actions.read({
+      owner: route.params._id,
+      startDate: dateRange.value.start.toISOString(),
+      endDate: dateRange.value.end.toISOString()
+    })
+  } catch (error) {
+    console.error('Error loading more data:', error)
+  } finally {
+    loading.value = false
+  }
 }
 
 // Handle item click
@@ -175,7 +173,14 @@ const handleItemClick = (item) => {
 
 // Handle today
 const handleToday = () => {
-  date.value = new Date()
+  const now = new Date()
+  date.value = now
+  
+  // For hours view, ensure we're showing the current hour
+  if (view.value === 'hours') {
+    // Update date to current time to trigger proper centering
+    date.value = new Date()
+  }
 }
 
 const today = new Date();
@@ -218,8 +223,7 @@ const loadMoreData = async ({ direction, date }) => {
     await rents.actions.read({
       owner: route.params._id,
       startDate: startDateParam.toISOString(),
-      endDate: endDateParam.toISOString(),
-      ...(tab.value !== 'all' && { status: tab.value })
+      endDate: endDateParam.toISOString()
     });
   } catch (error) {
     console.error('Error loading additional rent data:', error);