@ozdao/martyrs 0.2.485 → 0.2.487

package/src/modules/music/components/pages/SearchResults.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="search-results-page">
     <div class="search-header mn-b-medium">
-      <h1 class="t-white mn-b-small">Search</h1>
+      <h1 class=" mn-b-small">Search</h1>
       
       <SearchForm 
         :initialQuery="searchQuery"
@@ -17,7 +17,7 @@
           :key="filter.id"
           @click="setActiveFilter(filter.id)"
           :class="[
-            filter.id === activeFilter ? 'bg-white t-black' : 'bg-dark-transp-50 t-white hover-bg-dark',
+            filter.id === activeFilter ? 'bg-white t-black' : 'bg-dark-transp-50  hover-bg-dark',
           ]"
           class="radius-extra pd-small"
           :showLoader="false" 
@@ -37,19 +37,19 @@
     </div>
     
     <div v-else-if="!searchQuery" class="search-empty t-center pd-big">
-      <h2 class="t-white mn-b-small">Search for music</h2>
+      <h2 class=" mn-b-small">Search for music</h2>
       <p class="t-grey t-medium">Find your favorite songs, artists, albums, and playlists</p>
     </div>
     
     <div v-else-if="!hasResults" class="search-no-results t-center pd-big">
-      <h2 class="t-white mn-b-small">No results found for "{{ searchQuery }}"</h2>
+      <h2 class=" mn-b-small">No results found for "{{ searchQuery }}"</h2>
       <p class="t-grey t-medium">Please try different keywords or check your spelling</p>
     </div>
     
     <div v-else class="search-results">
       <!-- Top Results Section -->
       <section v-if="activeFilter === 'all'" class="search-section mn-b-medium">
-        <h2 class="t-white mn-b-small">Top Result</h2>
+        <h2 class=" mn-b-small">Top Result</h2>
         
         <div class="search-top-result bg-dark-transp-20 radius-medium p-medium">
           <div v-if="topResult.type === 'artist'" class="top-result-artist pd-medium">
@@ -59,11 +59,11 @@
                 class="w-10r h-10r object-fit-cover radius-round"
               />
             </div>
-            <h3 class="t-white t-semi">{{ topResult.item.name }}</h3>
+            <h3 class=" t-semi">{{ topResult.item.name }}</h3>
             <p class="t-grey">Artist</p>
             <Button 
               @click="playTopResult"
-              class="bg-main radius-round pd-small t-white mn-t-medium hover-scale-1"
+              class="bg-main radius-round pd-small  mn-t-medium hover-scale-1"
               :showLoader="false" 
               :showSucces="false"
             >
@@ -78,11 +78,11 @@
                 class="w-10r h-10r object-fit-cover radius-small"
               />
             </div>
-            <h3 class="t-white t-semi">{{ topResult.item.title }}</h3>
+            <h3 class=" t-semi">{{ topResult.item.title }}</h3>
             <p class="t-grey">Album • {{ getArtistName(topResult.item) }}</p>
             <Button 
               @click="playTopResult"
-              class="bg-main radius-round pd-small t-white mn-t-medium hover-scale-1"
+              class="bg-main radius-round pd-small  mn-t-medium hover-scale-1"
               :showLoader="false" 
               :showSucces="false"
             >
@@ -97,11 +97,11 @@
                 class="w-10r h-10r object-fit-cover radius-small"
               />
             </div>
-            <h3 class="t-white t-semi">{{ topResult.item.title }}</h3>
+            <h3 class=" t-semi">{{ topResult.item.title }}</h3>
             <p class="t-grey">Playlist • {{ getPlaylistOwner(topResult.item) }}</p>
             <Button 
               @click="playTopResult"
-              class="bg-main radius-round pd-small t-white mn-t-medium hover-scale-1"
+              class="bg-main radius-round pd-small  mn-t-medium hover-scale-1"
               :showLoader="false" 
               :showSucces="false"
             >
@@ -113,13 +113,34 @@
       
       <!-- Songs Results -->
       <section v-if="activeFilter === 'all' || activeFilter === 'tracks'" class="search-section mn-b-medium">
-        <h2 class="t-white mn-b-small">Songs</h2>
-        <TrackList 
-          :tracks="trackResults"
-          :showAlbum="true" 
-          :showCover="true"
-          class="bg-dark-transp-10 radius-medium o-hidden"
-        />
+        <h2 class=" mn-b-small">Songs</h2>
+        <Feed
+          :store="{
+            read: () => Promise.resolve(trackResults),
+            state: { isLoading: false }
+          }"
+          :external="true"
+          :items="trackResults"
+          :states="{
+            empty: {
+              title: 'No tracks found',
+              description: 'Try different search terms',
+              class: 'pd-medium bg-dark-transp-10 radius-medium'
+            }
+          }"
+          class="gap-thin"
+        >
+          <template #default="{ items }">
+            <TrackCard
+              v-for="track in items"
+              :key="track._id"
+              :track="track"
+              :showAlbum="true"
+              :showCover="true"
+              class="w-100 bg-dark-transp-10 radius-medium"
+            />
+          </template>
+        </Feed>
         
         <Button 
           v-if="trackResults.length > 4 && activeFilter === 'all'"
@@ -134,7 +155,7 @@
       
       <!-- Artists Results -->
       <section v-if="activeFilter === 'all' || activeFilter === 'artists'" class="search-section mn-b-medium">
-        <h2 class="t-white mn-b-small">Artists</h2>
+        <h2 class=" mn-b-small">Artists</h2>
         
         <div class="artists-grid cols-6 mobile:cols-3 gap-small">
           <div v-for="artist in artistResults.slice(0, activeFilter === 'all' ? 6 : artistResults.length)" :key="artist._id">
@@ -155,7 +176,7 @@
       
       <!-- Albums Results -->
       <section v-if="activeFilter === 'all' || activeFilter === 'albums'" class="search-section mn-b-medium">
-        <h2 class="t-white mn-b-small">Albums</h2>
+        <h2 class=" mn-b-small">Albums</h2>
         
         <div class="albums-grid cols-5 mobile:cols-2 gap-small">
           <div v-for="album in albumResults.slice(0, activeFilter === 'all' ? 5 : albumResults.length)" :key="album._id">
@@ -176,7 +197,7 @@
       
       <!-- Playlists Results -->
       <section v-if="activeFilter === 'all' || activeFilter === 'playlists'" class="search-section mn-b-medium">
-        <h2 class="t-white mn-b-small">Playlists</h2>
+        <h2 class=" mn-b-small">Playlists</h2>
         
         <div class="playlists-grid cols-5 mobile:cols-2 gap-small">
           <div v-for="playlist in playlistResults.slice(0, activeFilter === 'all' ? 5 : playlistResults.length)" :key="playlist._id">
@@ -197,7 +218,7 @@
       
       <!-- Genres Results -->
       <section v-if="(activeFilter === 'all' || activeFilter === 'genres') && genreResults.length > 0" class="search-section">
-        <h2 class="t-white mn-b-small">Genres</h2>
+        <h2 class=" mn-b-small">Genres</h2>
         
         <div class="genres-grid cols-4 mobile:cols-2 gap-small">
           <router-link 
@@ -209,7 +230,7 @@
               '--gradient-color': getRandomGradient() 
             }"
           >
-            <h3 class="t-white">{{ genre.name }}</h3>
+            <h3 class="">{{ genre.name }}</h3>
           </router-link>
         </div>
         
@@ -231,7 +252,8 @@
   import { ref, computed, onMounted, watch } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import SearchForm from '../forms/SearchForm.vue';
-  import TrackList from '../lists/TrackList.vue';
+  import Feed from '@martyrs/src/components/Feed/Feed.vue';
+  import TrackCard from '../cards/TrackCard.vue';
   import AlbumCard from '../cards/AlbumCard.vue';
   import PlaylistCard from '../cards/PlaylistCard.vue';
   import ArtistCard from '../cards/ArtistCard.vue';
@@ -317,15 +339,15 @@
         break;
       case 'album':
         // Navigate to album page
-        router.push({ name: 'album-detail', params: { url: item.url } });
+        router.push({ name: 'album', params: { url: item.url } });
         break;
       case 'playlist':
         // Navigate to playlist page
-        router.push({ name: 'playlist-detail', params: { url: item.url } });
+        router.push({ name: 'playlist', params: { url: item.url } });
         break;
       case 'artist':
         // Navigate to artist page
-        router.push({ name: 'artist-detail', params: { url: item.url } });
+        router.push({ name: 'artist', params: { url: item.url } });
         break;
     }
   };

package/src/modules/music/components/pages/{TrackDetail.vue → Track.vue}

@@ -1,6 +1,6 @@
-<!-- components/pages/TrackDetail.vue -->
+<!-- components/pages/Track.vue -->
 <template>
-  <div class="track-detail-page">
+  <div class="track-page">
     <!-- Loading -->
     <div v-if="isLoading" class="w-100 h-25r flex-center flex">
       <Loader />
@@ -8,7 +8,7 @@
 
     <!-- Not Found -->
     <div v-else-if="!track" class="t-center pd-big">
-      <h2 class="t-white">Track not found</h2>
+      <h2 class="">Track not found</h2>
       <p class="t-grey t-medium">The track you're looking for doesn't exist or has been removed.</p>
     </div>
 
@@ -18,26 +18,47 @@
 
       <!-- Track Lyrics -->
       <div v-if="track.lyrics" class="track-lyrics mn-b-medium pd-medium bg-dark-transp-10 radius-medium">
-        <h2 class="t-white mn-b-small">Lyrics</h2>
+        <h2 class=" mn-b-small">Lyrics</h2>
         <pre class="t-grey">{{ track.lyrics }}</pre>
       </div>
 
       <!-- Related Tracks -->
       <section v-if="relatedTracks.length" class="related-tracks mn-b-medium">
-        <h2 class="t-white mn-b-small">Related Tracks</h2>
-        <TrackList 
-          :tracks="relatedTracks"
-          :showAlbum="true"
-          :showCover="true"
-          class="bg-dark-transp-10 radius-medium o-hidden"
-        />
+        <h2 class=" mn-b-small">Related Tracks</h2>
+        <Feed
+          :store="{
+            read: () => Promise.resolve(relatedTracks.value),
+            state: { isLoading: false }
+          }"
+          :external="true"
+          :items="relatedTracks"
+          :states="{
+            empty: {
+              title: 'No related tracks',
+              description: 'Check back later for recommendations',
+              class: 'pd-medium bg-dark-transp-10 radius-medium'
+            }
+          }"
+          class="gap-thin"
+        >
+          <template #default="{ items }">
+            <TrackCard
+              v-for="relatedTrack in items"
+              :key="relatedTrack._id"
+              :track="relatedTrack"
+              :showAlbum="true"
+              :showCover="true"
+              class="w-100 bg-dark-transp-10 radius-medium"
+            />
+          </template>
+        </Feed>
       </section>
 
       <!-- Add to Playlist Modal -->
       <!-- <Popup 
         v-if="showAddToPlaylistModal" 
         @close-popup="showAddToPlaylistModal = false" 
-        class="bg-dark pd-small w-m-25r radius-medium t-white"
+        class="bg-dark pd-small w-m-25r radius-medium "
       >
         <h3 class="mn-b-medium">Add to Playlist</h3>
         <PlaylistSelector 
@@ -60,7 +81,8 @@ import Popup from '@martyrs/src/components/Popup/Popup.vue';
 import IconPlay from '@martyrs/src/modules/icons/navigation/IconPlay.vue';
 import IconLike from '@martyrs/src/modules/icons/navigation/IconLike.vue';
 import IconEllipsis from '@martyrs/src/modules/icons/navigation/IconEllipsis.vue';
-import TrackList from '../lists/TrackList.vue';
+import Feed from '@martyrs/src/components/Feed/Feed.vue';
+import TrackCard from '../cards/TrackCard.vue';
 // import PlaylistSelector from '../forms/PlaylistSelector.vue';
 
 import { state as tracksState, actions as tracksActions } from '../../store/tracks.js';
@@ -109,7 +131,7 @@ const addToQueue = () => {
 };
 
 const editTrack = () => {
-  router.push({ name: 'music-upload', query: { edit: track.value._id } });
+  router.push({ name: 'track-edit', params: { url: track.value.url } });
 };
 
 const deleteTrack = async () => {

package/src/modules/music/components/pages/TrackCreate.vue

@@ -0,0 +1,23 @@
+<!-- components/pages/TrackCreate.vue -->
+<template>
+  <div class="track-create-page">
+    <TrackForm :editMode="false" @uploaded="onTrackUploaded" />
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+import Button from '@martyrs/src/components/Button/Button.vue';
+import TrackForm from '../forms/TrackForm.vue';
+
+// Import auth store
+import { state as authState } from '@martyrs/src/modules/auth/views/store/auth.js';
+
+const router = useRouter();
+
+const onTrackUploaded = (track) => {
+  // Navigate to the uploaded track's detail page
+  router.push({ name: 'track', params: { url: track.url } });
+};
+</script>

package/src/modules/music/components/pages/TrackEdit.vue

@@ -0,0 +1,14 @@
+<template>
+  <TrackForm :editMode="true" :url="url" />
+</template>
+
+<script setup>
+import TrackForm from '../forms/TrackForm.vue';
+
+const props = defineProps({
+  url: {
+    type: String,
+    required: true
+  }
+});
+</script>

package/src/modules/music/components/player/MusicPlayer.vue

@@ -1,6 +1,6 @@
 <!-- components/player/MusicPlayer.vue -->
 <template>
-  <div class="music-player pd-small flex-between flex-v-center flex bg-dark br-t br-solid br-dark-transp-20 t-white">
+  <div class="music-player pd-small flex-between flex-v-center flex bg-dark br-t br-solid br-dark-transp-20 ">
     <!-- Current Track Info -->
     <div class="player-track-info flex-v-center flex w-25r">
       <div v-if="currentTrack" class="player-track-cover mn-r-small">
@@ -11,7 +11,7 @@
       </div>
       
       <div class="player-track-details t-truncate">
-        <div class="player-track-title t-white t-medium t-truncate">
+        <div class="player-track-title  t-medium t-truncate">
           {{ currentTrack?.title || 'No track playing' }}
         </div>
         <div class="player-track-artist t-grey t-small t-truncate">

package/src/modules/music/middlewares/albums.verifier.js

@@ -0,0 +1,234 @@
+// @martyrs/src/modules/music/middlewares/albums.verifier.js
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+export default function(db) {
+
+  // Верификатор для создания альбомов
+  const createVerifier = new Verifier({
+    title: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Album title is required')
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(1000, 'Description must not exceed 1000 characters')
+    },
+    releaseDate: {
+      rule: 'required',
+      validator: Validator.schema()
+        .date()
+        .required('Release date is required')
+    },
+    coverArt: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^https?:\/\/.+/, 'Invalid cover art URL format')
+    },
+    artists: {
+      rule: 'required',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid artist ID format')
+        )
+        .min(1, 'At least one artist is required')
+    },
+    type: {
+      rule: 'optional',
+      default: 'album',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['album', 'single', 'EP', 'compilation'], 'Invalid album type')
+    },
+    genres: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid genre ID format')
+        )
+    },
+    totalTracks: {
+      rule: 'optional',
+      default: 0,
+      validator: Validator.schema()
+        .integer()
+        .min(0, 'Total tracks cannot be negative')
+        .max(100, 'Too many tracks')
+    },
+    owner: {
+      rule: 'required',
+      validator: Validator.schema().object({
+        type: Validator.schema().string().oneOf(['user', 'organization']),
+        target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
+      })
+    }
+  });
+
+  // Верификатор для обновления альбомов
+  const updateVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Album ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid album ID format')
+    },
+    title: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(1000, 'Description must not exceed 1000 characters')
+    },
+    releaseDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    coverArt: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^https?:\/\/.+/, 'Invalid cover art URL format')
+    },
+    artists: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid artist ID format')
+        )
+        .min(1, 'At least one artist is required')
+    },
+    type: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['album', 'single', 'EP', 'compilation'], 'Invalid album type')
+    },
+    genres: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid genre ID format')
+        )
+    },
+    totalTracks: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(0, 'Total tracks cannot be negative')
+        .max(100, 'Too many tracks')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['draft', 'published', 'archived'], 'Invalid status')
+    }
+  });
+
+  // Верификатор для чтения альбомов
+  const readVerifier = new Verifier({
+    _id: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid album ID format')
+    },
+    artists: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid artist ID format')
+    },
+    type: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['album', 'single', 'EP', 'compilation'])
+    },
+    genres: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid genre ID format')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['draft', 'published', 'archived'])
+    },
+    skip: {
+      rule: 'optional',
+      default: 0,
+      validator: Validator.schema()
+        .integer()
+        .min(0)
+    },
+    limit: {
+      rule: 'optional',
+      default: 20,
+      validator: Validator.schema()
+        .integer()
+        .min(1)
+        .max(100)
+    },
+    sortParam: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['title', 'releaseDate', 'totalTracks', 'createdAt', 'updatedAt'])
+    },
+    sortOrder: {
+      rule: 'optional',
+      default: 'desc',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['asc', 'desc'])
+    }
+  });
+
+  // Верификатор для удаления альбомов
+  const deleteVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Album ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid album ID format')
+    }
+  });
+
+  return {
+    createVerifier,
+    readVerifier,
+    updateVerifier,
+    deleteVerifier
+  };
+}