@ozdao/martyrs 0.2.601 → 0.2.603

package/src/modules/governance/views/store/tasks.js

@@ -7,17 +7,33 @@ import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 const tasksState = reactive({
   all: [],
   current: {
-    name: '',
+    title: '',
     description: '',
-    status: '',
-    assignedTo: '',
-    createdBy: '',
+    status: 'not_started',
+    assignedTo: null,
+    dueDate: null,
+    sprint: null,
+    initiative: null,
+    priority: 'medium',
+    tags: [],
+    proposedByVoting: null,
+    completionVoting: null,
+    completedDate: null,
     createdAt: null,
     updatedAt: null,
   },
 });
 
 const tasksActions = {
+  async getByInitiative(initiativeId) {
+    try {
+      const response = await $axios.get('/api/tasks/read', { params: { initiative: initiativeId } });
+      return Array.isArray(response.data) ? response.data : [];
+    } catch (error) {
+      setError(error);
+      return [];
+    }
+  },
   async getAllTasks() {
     try {
       const response = await $axios.get('/api/tasks/read');
@@ -31,8 +47,8 @@ const tasksActions = {
   async getTaskById(id) {
     try {
       const response = await $axios.get('/api/tasks/read', { params: { _id: id } });
-      tasksState.current = response.data;
-      return response.data;
+      tasksState.current = Array.isArray(response.data) ? response.data[0] : response.data;
+      return tasksState.current;
     } catch (error) {
       setError(error);
       throw error;
@@ -51,10 +67,10 @@ const tasksActions = {
   async updateTask(task) {
     try {
       const response = await $axios.put('/api/tasks/update', {
-        _id: task._id || task.id,
+        _id: task._id,
         ...task
       });
-      const index = tasksState.all.findIndex(t => (t._id || t.id) === (task._id || task.id));
+      const index = tasksState.all.findIndex(t => t._id === (task._id));
       if (index !== -1) {
         tasksState.all[index] = response.data;
       }
@@ -67,7 +83,7 @@ const tasksActions = {
   async deleteTask(id) {
     try {
       await $axios.post('/api/tasks/delete', { _id: id });
-      tasksState.all = tasksState.all.filter(t => (t._id || t.id) !== id);
+      tasksState.all = tasksState.all.filter(t => t._id !== id);
     } catch (error) {
       setError(error);
       throw error;

package/src/modules/governance/views/store/votings.js

@@ -4,55 +4,80 @@ import { setError } from '@martyrs/src/modules/core/views/store/core.store.js';
 
 import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 
-// Votes Store
-const votesState = reactive({
+// Votings Store
+const votingsState = reactive({
   all: [],
   current: {
-    votingId: '',
-    userId: '',
-    choice: '',
+    title: '',
+    description: '',
+    type: 'general',
+    targetModel: null,
+    targetId: null,
+    threshold: 51,
+    participants: [],
+    result: 'pending',
+    initiative: null,
+    sprint: null,
+    task: null,
+    metadata: null,
+    startDate: null,
+    endDate: null,
+    status: 'pending',
+    votes: [],
     createdAt: null,
+    updatedAt: null,
   },
 });
 
-const votesActions = {
-  async castVote(votingId, vote) {
+const votingsActions = {
+  async getByInitiative(initiativeId) {
     try {
-      const response = await $axios.post(`/api/votings/${votingId}/vote`, vote);
-      votesState.all.push(response.data);
+      const response = await $axios.get('/api/votings/read', { params: { initiative: initiativeId } });
+      return Array.isArray(response.data) ? response.data : [];
+    } catch (error) {
+      setError(error);
+      return [];
+    }
+  },
+  async getAllVotings() {
+    try {
+      const response = await $axios.get('/api/votings/read');
+      votingsState.all = response.data;
       return response.data;
     } catch (error) {
       setError(error);
       throw error;
     }
   },
-  async getVotesForVoting(votingId) {
+  async getVotingById(id) {
     try {
-      const response = await $axios.get('/api/votes/read', { params: { voting: votingId } });
-      return response.data;
+      const response = await $axios.get('/api/votings/read', { params: { _id: id } });
+      votingsState.current = Array.isArray(response.data) ? response.data[0] : response.data;
+      return votingsState.current;
     } catch (error) {
       setError(error);
       throw error;
     }
   },
-  async getUserVotes(userId) {
+  async createVoting(voting) {
     try {
-      const response = await $axios.get('/api/votes/read', { params: { voter: userId } });
+      const response = await $axios.post('/api/votings/create', voting);
+      votingsState.all.push(response.data);
       return response.data;
     } catch (error) {
       setError(error);
       throw error;
     }
   },
-  async updateVote(id, vote) {
+  async updateVoting(voting) {
     try {
-      const response = await $axios.put('/api/votes/update', {
-        _id: id,
-        ...vote
+      const response = await $axios.put('/api/votings/update', {
+        _id: voting._id,
+        ...voting
       });
-      const index = votesState.all.findIndex(v => (v._id || v.id) === id);
+      const index = votingsState.all.findIndex(v => v._id === (voting._id));
       if (index !== -1) {
-        votesState.all[index] = response.data;
+        votingsState.all[index] = response.data;
       }
       return response.data;
     } catch (error) {
@@ -60,10 +85,64 @@ const votesActions = {
       throw error;
     }
   },
-  async deleteVote(id) {
+  async deleteVoting(id) {
+    try {
+      await $axios.post('/api/votings/delete', { _id: id });
+      votingsState.all = votingsState.all.filter(v => v._id !== id);
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async startVoting(id) {
+    try {
+      const response = await $axios.post(`/api/votings/${id}/start`);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async endVoting(id) {
+    try {
+      const response = await $axios.post(`/api/votings/${id}/end`);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async getVotingResults(id) {
+    try {
+      const response = await $axios.get(`/api/votings/${id}/results`);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async castVote(votingId, vote) {
+    try {
+      const response = await $axios.post(`/api/votings/${votingId}/vote`, vote);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async getVotesForVoting(votingId) {
     try {
-      await $axios.post('/api/votes/delete', { _id: id });
-      votesState.all = votesState.all.filter(v => (v._id || v.id) !== id);
+      const response = await $axios.get('/api/votes/read', { params: { voting: votingId } });
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
+  },
+  async getUserVotes(userId) {
+    try {
+      const response = await $axios.get('/api/votes/read', { params: { voter: userId } });
+      return response.data;
     } catch (error) {
       setError(error);
       throw error;
@@ -71,10 +150,10 @@ const votesActions = {
   },
 };
 
-const votesHistory = [];
+const votingsHistory = [];
 
-watch(votesState, newState => {
-  votesHistory.push(JSON.parse(JSON.stringify(newState)));
+watch(votingsState, newState => {
+  votingsHistory.push(JSON.parse(JSON.stringify(newState)));
 });
 
-export { votesActions, votesState };
+export { votingsActions, votingsState };

package/src/modules/icons/icons.client.js

@@ -215,7 +215,7 @@ export {
 
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
-import { getRoutes } from './icons.router.js';
+import { getRoutes } from './router/icons.router.js';
 
 // Icons page component
 import IconsPage from './pages/IconsPage.vue';

package/src/modules/inventory/components/pages/InventoryEdit.vue

@@ -163,7 +163,7 @@
         :image="position.image"
         :name="position.name"
         :title="formatPrice(position.cost * position.quantity)"
-        :title_class="[position.cost * position.quantity < 0 ? 't-red' : 't-grey']"
+        :title_class="[position.cost * position.quantity < 0 ? 't-red' : 't-dark']"
         :subtitle="`${formatPrice(position.cost)} × ${Math.abs(position.quantity)}${position.unit} `"
       >
         <template v-slot:actions>

package/src/modules/music/components/sections/PopularTracks.vue

@@ -0,0 +1,52 @@
+<template>
+  <section class="mn-b-medium">
+    <div class="flex-justify-between flex mn-b-small">
+      <h3 class="">Popular Tracks</h3>
+    </div>
+
+    <Feed
+      :showLoadMore="false"
+      :LoadMore="false"
+      :states="{
+        empty: {
+          title: 'No Popular Tracks',
+          description: 'No popular tracks available at the moment.'
+        }
+      }"
+      :store="{
+        read: (options) => tracksActions.fetchPopularTracks(options),
+        state: tracksState
+      }"
+      :options="{
+        limit: 10,
+        popular: true
+      }"
+      :skeleton="{
+        structure: [
+          { block: 'text', size: 'medium' },
+          { block: 'text', size: 'small' }
+        ],
+        horizontal: true
+      }"
+      v-slot="{ items }"
+      class="gap-zero bg-light radius-medium o-hidden"
+    >
+      <div class="">
+        <TrackListCard
+          v-for="(track, index) in items"
+          :key="track._id"
+          :track="track"
+          :index="index"
+          :showAlbum="true"
+          :showCover="true"
+        />
+      </div>
+    </Feed>
+  </section>
+</template>
+
+<script setup>
+import Feed from '@martyrs/src/components/Feed/Feed.vue';
+import TrackListCard from '../cards/TrackListCard.vue';
+import { state as tracksState, actions as tracksActions } from '../../store/tracks.js';
+</script>

package/src/modules/music/music.client.js

@@ -9,7 +9,7 @@ import * as storeTracks from './store/tracks.js';
 
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
-import { getRoutes } from './music.router.js';
+import { getRoutes } from './router/music.router.js';
 
 // Layouts
 import MusicBottomPlayer from './components/layouts/MusicBottomPlayer.vue';
@@ -29,6 +29,9 @@ import MusicPlayer from './components/player/MusicPlayer.vue';
 import TrackProgress from './components/player/TrackProgress.vue';
 import VolumeControl from './components/player/VolumeControl.vue';
 
+// Components - Sections
+import PopularTracks from './components/sections/PopularTracks.vue';
+
 // Components - Cards
 import AlbumCard from './components/cards/AlbumCard.vue';
 import ArtistCard from './components/cards/ArtistCard.vue';
@@ -126,6 +129,8 @@ const ModuleMusic = {
       MusicPlayer,
       TrackProgress,
       VolumeControl,
+      // Sections
+      PopularTracks,
       // Cards
       TrackListCard,
       AlbumCard,
@@ -147,6 +152,8 @@ export {
   Album,
   ArtistCard,
   Artist,
+  // Sections
+  PopularTracks,
   // Pages
   MusicHome,
   // Layout

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

@@ -1,3 +1,6 @@
+import PlayerMusic from  '../components/layouts/MusicBottomPlayer.vue'
+
+
 function createArtistRoutes() {
   return [
     {
@@ -148,6 +151,15 @@ function buildMusicRoutes() {
         title: 'Search Music',
       },
     },
+    {
+      path: 'library',
+      name: 'music-library',
+      component: () => import(/* webpackChunkName: 'music-library' */ '../components/pages/MusicLibrary.vue'),
+      meta: {
+        title: 'My Library',
+        requiresAuth: true,
+      },
+    },
     ...createArtistRoutes(),
     ...createAlbumRoutes(),
     ...createTrackRoutes(),
@@ -164,7 +176,7 @@ export function getRoutes(options = {}) {
     config: {
       basePath: options.basePath || 'music',
       meta: {
-        player: options.playerComponent || (() => import(/* webpackChunkName: 'music-bottom-player' */ '../components/layouts/MusicBottomPlayer.vue')),
+        player: PlayerMusic,
       },
       routes: buildMusicRoutes(options),
     },

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

@@ -1,18 +1,15 @@
 <template>
   <div class="notification-badge-container">
-    <button 
-      class="i-medium notification-button"
-      @click="toggleNotifications"
+    <Button
+      class="pd-zero bg-transparent"
       :aria-label="unreadCount > 0 ? `${unreadCount} unread notifications` : 'No unread notifications'"
+      :submit="() => toggleNotifications()"
+      :counter="unreadCount > 0 ? (unreadCount > 99 ? '99+' : unreadCount) : null"
+      :showSucces="false"
+      :showLoader="false"
     >
       <IconBell class="notification-icon i-medium" :fill="fill"/>
-      <div  
-        v-if="unreadCount > 0" 
-        class="button-counter flex flex-center"
-      >
-        <span>{{ unreadCount > 99 ? '99+' : unreadCount }}</span>
-      </div>
-    </button>
+    </Button>
     
     <Popup
       title="Notifications"
@@ -64,6 +61,7 @@ import { ref, computed, onMounted, inject } from 'vue';
 import { useRouter } from 'vue-router';
 
 import Popup from '@martyrs/src/components/Popup/Popup.vue';
+import Button from '@martyrs/src/components/Button/Button.vue';
 
 import NotificationItem from '../blocks/NotificationItem.vue';
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
@@ -142,33 +140,10 @@ onMounted(() => {
   display: inline-block;
 }
 
-.notification-button {
-  background: none;
-  border: none;
-  cursor: pointer;
-  position: relative;
-  font-size: 1.2rem;
-}
-
 .notification-icon {
   font-size: 1.4rem;
 }
 
-.button-counter {
-  position: absolute;
-  right: -8px;
-  bottom: -8px;
-  background: rgb(var(--fourth));
-  color: rgb(var(--white));
-  height: 16px;
-  border-radius: 16px;
-  width: 16px;
-  font-weight: 500;
-  text-align: center;
-  line-height: 16px;
-  font-size: 10px;
-}
-
 
 .notifications-loading,
 .notifications-empty {

package/src/modules/notifications/components/sections/NotificationPreferences.vue

@@ -1,51 +1,73 @@
 <template>
   <div>
-    <p class="t-transp mn-b-small">Choose how you want to receive notifications</p>
-
-    <div v-if="loading" class="pd-large t-center t-transp">
-      <Loader />
-    </div>
-
-    <div v-else class="gap-thin flex-column flex">
-      <div
-        v-for="(enabled, channelType) in preferences"
-        :key="channelType"
-        class="flex flex-v-center flex-between bg-light radius-small pd-small"
-      >
-        <div class="flex w-100 flex-v-center gap-small mn-r-small">
-          <div class="h4">{{ getChannelIcon(channelType) }}</div>
+    <!-- Push Permission Toggle -->
+    <div class="bg-light radius-small pd-small mn-b-small">
+      <div class="flex flex-v-center flex-between">
+        <div class="flex flex-v-center gap-small">
+          <div class="h4">🔔</div>
           <div class="flex-column flex gap-micro">
-            <p class="fw-medium lh-1">{{ getChannelName(channelType) }}</p>
-            <p class="p-small t-transp lh-1">{{ getChannelDescription(channelType) }}</p>
+            <p class="fw-medium">Push Notifications</p>
+            <p class="p-small" :class="pushStatusClass">{{ pushStatusText }}</p>
           </div>
         </div>
         <Checkbox
           mode="switch"
-          :radio="enabled"
-          @update:radio="updatePreference(channelType, $event)"
+          :radio="pushEnabled"
+          :disabled="pushPermission === 'denied'"
+          @update:radio="togglePush"
           class="flex-shrink-0"
         />
       </div>
+    </div>
 
-      <div class="flex flex-end gap-small mn-t-thin">
-        <Button
-          v-if="hasChanges"
-          :submit="resetChanges"
-          :showLoader="false"
-          :showSucces="false"
-          class="bg-white t-dark"
-        >
-          Cancel
-        </Button>
-        <Button
-          :submit="savePreferences"
-          :validation="!hasChanges || saving"
-          class="bg-main t-white"
+    <template v-if="pushEnabled && pushPermission === 'granted'">
+      <p class="t-transp mn-b-small">Choose how you want to receive notifications</p>
+
+      <div v-if="loading" class="pd-large t-center t-transp">
+        <Loader />
+      </div>
+
+      <div v-else class="gap-thin flex-column flex">
+        <div
+          v-for="(enabled, channelType) in preferences"
+          :key="channelType"
+          class="flex flex-v-center flex-between bg-light radius-small pd-small"
         >
-          {{ saving ? 'Saving...' : 'Save Changes' }}
-        </Button>
+          <div class="flex w-100 flex-v-center gap-small mn-r-small">
+            <div class="h4">{{ getChannelIcon(channelType) }}</div>
+            <div class="flex-column flex gap-micro">
+              <p class="fw-medium">{{ getChannelName(channelType) }}</p>
+              <p class="p-small t-transp">{{ getChannelDescription(channelType) }}</p>
+            </div>
+          </div>
+          <Checkbox
+            mode="switch"
+            :radio="enabled"
+            @update:radio="updatePreference(channelType, $event)"
+            class="flex-shrink-0"
+          />
+        </div>
+
+        <div class="flex flex-end gap-small mn-t-thin">
+          <Button
+            v-if="hasChanges"
+            :submit="resetChanges"
+            :showLoader="false"
+            :showSucces="false"
+            class="bg-white t-dark"
+          >
+            Cancel
+          </Button>
+          <Button
+            :submit="savePreferences"
+            :validation="!hasChanges || saving"
+            class="bg-main t-white"
+          >
+            {{ saving ? 'Saving...' : 'Save Changes' }}
+          </Button>
+        </div>
       </div>
-    </div>
+    </template>
   </div>
 </template>
 
@@ -56,11 +78,12 @@ import Button from '@martyrs/src/components/Button/Button.vue';
 import Loader from '@martyrs/src/components/Loader/Loader.vue';
 
 // Get notification preferences functionality
-const { 
+const {
   preferences: storePreferences,
   loading,
   getPreferences,
-  updatePreferences
+  updatePreferences,
+  registerWebPush,
 } = inject('useNotifications')();
 
 // Local reactive state for form
@@ -68,9 +91,49 @@ const preferences = reactive({...storePreferences.value});
 const originalPreferences = ref({});
 const saving = ref(false);
 
+// Push permission state
+const pushPermission = ref(typeof window !== 'undefined' && 'Notification' in window ? Notification.permission : 'default');
+const pushEnabled = ref(pushPermission.value === 'granted');
+
+const pushStatusText = computed(() => {
+  if (pushPermission.value === 'denied') return 'Blocked by browser. Allow in site settings';
+  if (pushEnabled.value && pushPermission.value === 'granted') return 'Notifications are enabled';
+  return 'Enable to receive push notifications';
+});
+
+const pushStatusClass = computed(() => {
+  if (pushPermission.value === 'denied') return 't-red';
+  if (pushEnabled.value && pushPermission.value === 'granted') return 't-green';
+  return 't-transp';
+});
+
+const togglePush = async (value) => {
+  if (value) {
+    // Turning ON → request browser permission DIRECTLY in click handler
+    try {
+      const permission = await Notification.requestPermission();
+      pushPermission.value = permission;
+      if (permission === 'granted') {
+        pushEnabled.value = true;
+        // Now register subscription in background
+        registerWebPush().catch(err => console.error('Web push registration error:', err));
+      } else {
+        pushEnabled.value = false;
+      }
+    } catch (error) {
+      console.error('Push permission error:', error);
+      pushPermission.value = Notification.permission;
+      pushEnabled.value = false;
+    }
+  } else {
+    // Turning OFF
+    pushEnabled.value = false;
+  }
+};
+
 // Computed properties
 const hasChanges = computed(() => {
-  return Object.keys(preferences).some(key => 
+  return Object.keys(preferences).some(key =>
     preferences[key] !== originalPreferences.value[key]
   );
 });
@@ -124,19 +187,19 @@ const getChannelName = (channelType) => {
 
 const getChannelDescription = (channelType) => {
   switch (channelType) {
-    case 'web': 
+    case 'web':
       return 'Real-time notifications in your browser';
-    case 'push': 
+    case 'push':
       return 'Notifications on your mobile device even when the app is closed';
-    case 'email': 
+    case 'email':
       return 'Receive notifications in your email inbox';
-    case 'sms': 
+    case 'sms':
       return 'Get text messages for important notifications';
-    case 'telegram': 
+    case 'telegram':
       return 'Receive notifications via Telegram bot';
-    case 'whatsapp': 
+    case 'whatsapp':
       return 'Get notifications as WhatsApp messages';
-    default: 
+    default:
       return '';
   }
 };
@@ -144,14 +207,13 @@ const getChannelDescription = (channelType) => {
 // Lifecycle
 onMounted(async () => {
   await getPreferences();
-  
+
   // Copy store preferences to local state
   Object.keys(storePreferences.value).forEach(key => {
     preferences[key] = storePreferences.value[key];
   });
-  
+
   // Create a deep copy of the original preferences
   originalPreferences.value = {...preferences};
 });
 </script>
-