@ozdao/martyrs 0.2.602 → 0.2.603

package/src/modules/governance/models/voting.model.js

@@ -5,13 +5,13 @@ export default db => {
       description: { type: String },
       type: {
         type: String,
-        enum: ['create_task', 'approve_task', 'create_initiative', 'update_milestone', 'general'],
+        enum: ['create_task', 'approve_task', 'create_initiative', 'update_sprint', 'general'],
         default: 'general',
         required: true,
       },
       targetModel: {
         type: String,
-        enum: ['Task', 'Initiative', 'Milestone', null],
+        enum: ['Task', 'Initiative', 'Sprint', null],
       },
       targetId: {
         type: db.mongoose.Schema.Types.ObjectId,
@@ -37,9 +37,13 @@ export default db => {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Initiative',
       },
-      milestone: {
+      sprint: {
         type: db.mongoose.Schema.Types.ObjectId,
-        ref: 'Milestone',
+        ref: 'Sprint',
+      },
+      task: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'Task',
       },
       metadata: {
         type: Object, // For storing additional data like taskData for create_task voting
@@ -83,7 +87,8 @@ export default db => {
 
   // Indexes
   VotingSchema.index({ initiative: 1 });
-  VotingSchema.index({ milestone: 1 });
+  VotingSchema.index({ sprint: 1 });
+  VotingSchema.index({ task: 1 });
   VotingSchema.index({ type: 1, targetId: 1 });
   VotingSchema.index({ result: 1 });
 

package/src/modules/governance/views/components/blocks/CardInitiativeItem.vue

@@ -1,8 +1,11 @@
 <script setup>
 import { defineProps, computed } from 'vue';
 import TaskStatusBadge from '../partials/TaskStatusBadge.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 import { IconCalendar } from '@martyrs/src/modules/icons/icons.client.js';
 
+const { formatDate } = useGlobalMixins();
+
 const props = defineProps({
   initiative: {
     type: Object,
@@ -10,15 +13,7 @@ const props = defineProps({
   }
 });
 
-const formatDate = (dateString) => {
-  return new Date(dateString).toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-  });
-};
-
-const milestoneCount = computed(() => props.initiative.milestoneCount || 0);
+const sprintCount = computed(() => props.initiative.sprintCount || 0);
 const createdDate = computed(() => props.initiative.createdAt || props.initiative.date);
 const coverUrl = computed(() => {
   if (!props.initiative.cover) return null;
@@ -30,7 +25,7 @@ const coverUrl = computed(() => {
 
 <template>
   <router-link
-    :to="{ name: 'Initiative', params: { id: initiative._id || initiative.id } }"
+    :to="`/governance/initiatives/${initiative._id}`"
     class="d-block"
   >
     <div class="br-black-transp-10 br-1px radius-medium hover:scale-[1.05] ease-cubic-in-out o-hidden">
@@ -44,13 +39,13 @@ const coverUrl = computed(() => {
       <div class="pd-small">
         <div class="flex flex-justify-between flex-v-center mn-b-small">
           <TaskStatusBadge :status="initiative.status" />
-          <div v-if="milestoneCount > 0" class="flex flex-v-center t-transp p-small">
+          <div v-if="sprintCount > 0" class="flex flex-v-center t-transp p-small">
             <svg class="i-regular mn-r-thin" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
               <path d="M12 2L2 7l10 5 10-5-10-5z"/>
               <path d="M2 17l10 5 10-5"/>
               <path d="M2 12l10 5 10-5"/>
             </svg>
-            <span>{{ milestoneCount }}</span>
+            <span>{{ sprintCount }}</span>
           </div>
         </div>
         <h3 class="h4 fw-medium mn-b-small hover:t-main ease-cubic-in-out truncate">
@@ -61,7 +56,7 @@ const coverUrl = computed(() => {
         </p>
         <div v-if="createdDate" class="flex flex-v-center t-transp p-small">
           <IconCalendar class="i-regular mn-r-thin" :fill="'currentColor'" />
-          <span>{{ formatDate(createdDate) }}</span>
+          <span>{{ formatDate(createdDate, { dateOnly: true }) }}</span>
         </div>
       </div>
     </div>

package/src/modules/governance/views/components/blocks/{CardMilestoneItem.vue → CardSprintItem.vue}

@@ -1,45 +1,44 @@
 <script setup>
 import { defineProps } from 'vue';
+import { useRoute } from 'vue-router';
 import TaskStatusBadge from '../partials/TaskStatusBadge.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 import { IconCalendar, IconCheckmark } from '@martyrs/src/modules/icons/icons.client.js';
 
+const route = useRoute();
+const { formatDate } = useGlobalMixins();
+
 const props = defineProps({
-  milestone: {
+  sprint: {
     type: Object,
     required: true
   }
 });
 
-const formatDate = (dateString) => {
-  return new Date(dateString).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-  });
-};
 </script>
 
 <template>
   <router-link
-    :to="{ name: 'Milestone', params: { id: milestone._id || milestone.id } }"
+    :to="`/governance/initiatives/${route.params.id}/sprints/${sprint._id}`"
     class="d-block"
   >
     <div class="br-black-transp-10 br-1px radius-medium hover:scale-[1.05] ease-cubic-in-out pd-small">
       <div class="flex flex-justify-between flex-align-start mn-b-small">
         <h3 class="h5 fw-medium flex-child-1 hover:t-main ease-cubic-in-out">
-          {{ milestone.name }}
+          {{ sprint.name }}
         </h3>
-        <TaskStatusBadge :status="milestone.status" />
+        <TaskStatusBadge :status="sprint.status" />
       </div>
 
       <div class="mn-b-medium">
         <div class="flex flex-justify-between mn-b-small p-small">
           <span class="t-transp">Progress</span>
-          <span class="fw-medium">{{ milestone.progress }}%</span>
+          <span class="fw-medium">{{ sprint.progress }}%</span>
         </div>
         <div class="w-100 bg-light radius-thin h-thin o-hidden">
           <div
             class="bg-main h-100 ease-cubic-in-out"
-            :style="{ width: `${milestone.progress}%` }"
+            :style="{ width: `${sprint.progress}%` }"
           />
         </div>
       </div>
@@ -48,22 +47,22 @@ const formatDate = (dateString) => {
         <div class="flex flex-v-center t-transp">
           <IconCalendar class="i-regular mn-r-thin" :fill="'currentColor'" />
           <span>
-            {{ formatDate(milestone.startDate) }} - {{ formatDate(milestone.dueDate) }}
+            {{ formatDate(sprint.startDate, { dayMonth: true }) }} - {{ formatDate(sprint.dueDate, { dayMonth: true }) }}
           </span>
         </div>
         <div class="flex flex-v-center t-transp">
           <IconCheckmark class="i-regular mn-r-thin" :fill="'currentColor'" />
-          <span>{{ milestone.taskCount }}</span>
+          <span>{{ sprint.taskCount }}</span>
         </div>
       </div>
 
       <div class="mn-t-medium flex flex-v-center">
         <img
-          :src="milestone.owner.avatar"
-          :alt="milestone.owner.name"
+          :src="sprint.owner.avatar"
+          :alt="sprint.owner.name"
           class="i-medium radius-medium"
         />
-        <span class="mn-l-thin p-small t-transp">{{ milestone.owner.name }}</span>
+        <span class="mn-l-thin p-small t-transp">{{ sprint.owner.name }}</span>
       </div>
     </div>
   </router-link>

package/src/modules/governance/views/components/blocks/CardTaskItem.vue

@@ -1,8 +1,13 @@
 <script setup>
 import { defineProps, computed } from 'vue';
+import { useRoute } from 'vue-router';
 import TaskStatusBadge from '../partials/TaskStatusBadge.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 import { IconCalendar, IconSend } from '@martyrs/src/modules/icons/icons.client.js';
 
+const route = useRoute();
+const { formatDate } = useGlobalMixins();
+
 const props = defineProps({
   task: {
     type: Object,
@@ -10,13 +15,6 @@ const props = defineProps({
   }
 });
 
-const formatDate = (dateString) => {
-  return new Date(dateString).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-  });
-};
-
 const priorityConfig = {
   low: 'br-l-green',
   medium: 'br-l-yellow',
@@ -28,7 +26,7 @@ const borderColor = computed(() => priorityConfig[props.task.priority] || priori
 
 <template>
   <router-link
-    :to="{ name: 'Task', params: { id: task._id || task.id } }"
+    :to="`/governance/initiatives/${route.params.id}/tasks/${task._id}`"
     class="d-block"
   >
     <div :class="`br-black-transp-10 br-1px radius-medium hover:scale-[1.05] ease-cubic-in-out pd-small cursor-pointer`">
@@ -54,7 +52,7 @@ const borderColor = computed(() => priorityConfig[props.task.priority] || priori
       <div class="flex flex-justify-between flex-v-center">
         <div v-if="task.dueDate" class="flex flex-v-center p-small t-transp">
           <IconCalendar class="i-regular mn-r-thin" :fill="'currentColor'" />
-          <span>{{ formatDate(task.dueDate) }}</span>
+          <span>{{ formatDate(task.dueDate, { dayMonth: true }) }}</span>
         </div>
         <img
           v-if="task.assignee"

package/src/modules/governance/views/components/blocks/CardVotingItem.vue

@@ -1,8 +1,13 @@
 <script setup>
 import { defineProps, computed } from 'vue';
+import { useRoute } from 'vue-router';
 import TaskStatusBadge from '../partials/TaskStatusBadge.vue';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 import { IconCalendar, IconSend } from '@martyrs/src/modules/icons/icons.client.js';
 
+const route = useRoute();
+const { formatDate } = useGlobalMixins();
+
 const props = defineProps({
   voting: {
     type: Object,
@@ -21,18 +26,11 @@ const percentageYes = computed(() =>
   props.voting.totalVotes > 0 ? (props.voting.yesVotes / props.voting.totalVotes) * 100 : 0
 );
 
-const formatDate = (dateString) => {
-  return new Date(dateString).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-  });
-};
 </script>
 
 <template>
   <router-link
-    :to="{ name: 'Voting', params: { id: voting._id || voting.id } }"
+    :to="`/governance/initiatives/${route.params.id}/votings/${voting._id}`"
     class="d-block"
   >
     <div class="br-black-transp-10 br-1px radius-medium hover:scale-[1.05] ease-cubic-in-out pd-small">
@@ -63,7 +61,7 @@ const formatDate = (dateString) => {
       <div class="flex flex-justify-between flex-v-center p-small">
         <div class="flex flex-v-center t-transp">
           <IconCalendar class="i-regular mn-r-thin" :fill="'currentColor'" />
-          <span>{{ formatDate(voting.createdAt) }}</span>
+          <span>{{ formatDate(voting.createdAt, { dateOnly: true }) }}</span>
         </div>
         <div class="flex flex-v-center t-transp">
           <IconSend class="i-regular mn-r-thin" :fill="'currentColor'" />

package/src/modules/governance/views/components/pages/Governance.vue

@@ -1,44 +1,23 @@
 <template>
-  <div class="governance-main pd-big">
-    <header class="mn-b-big t-center">
-      <h1 class="h2 mn-b-medium">Governance</h1>
-      <p class="p-medium">Participate in OZ DAO governance through initiatives, tasks, and voting</p>
-    </header>
+  <div class="min-h-100vh pd-medium pd-y-semi">
+    <h1 class="h2 fw-medium mn-b-semi">Governance</h1>
+    <p class="t-dark mn-b-medium">Decentralized governance of OZ DAO ecosystem</p>
 
-    <div class="cols-3 mobile:cols-1 gap-regular">
-      <router-link
-        :to="{ name: 'Initiatives' }"
-        class="br-black-transp-10 br-1px radius-medium pd-big hover:scale-[1.05] ease-cubic"
-      >
-        <h3 class="h4 mn-b-small">Initiatives</h3>
-        <p>Browse and create initiatives for the DAO</p>
+    <div class="flex flex-wrap gap-semi">
+      <router-link to="/governance/initiatives" class="bg-light radius-semi pd-semi flex-grow hover:bg-grey-light ease-cubic-in-out" style="text-decoration: none; min-width: 280px;">
+        <h3 class="h4 fw-medium mn-b-thin">Initiatives</h3>
+        <p class="t-dark">Community proposals and projects</p>
       </router-link>
 
-      <router-link
-        :to="{ name: 'Tasks' }"
-        class="br-black-transp-10 br-1px radius-medium pd-big hover:scale-[1.05] ease-cubic"
-      >
-        <h3 class="h4 mn-b-small">Tasks</h3>
-        <p>View and manage tasks for DAO projects</p>
+      <router-link to="/governance/tasks" class="bg-light radius-semi pd-semi flex-grow hover:bg-grey-light ease-cubic-in-out" style="text-decoration: none; min-width: 280px;">
+        <h3 class="h4 fw-medium mn-b-thin">Tasks</h3>
+        <p class="t-dark">Work items and assignments</p>
       </router-link>
 
-      <router-link
-        :to="{ name: 'Votings' }"
-        class="br-black-transp-10 br-1px radius-medium pd-big hover:scale-[1.05] ease-cubic"
-      >
-        <h3 class="h4 mn-b-small">Votings</h3>
-        <p>Participate in DAO voting and proposals</p>
+      <router-link to="/governance/votings" class="bg-light radius-semi pd-semi flex-grow hover:bg-grey-light ease-cubic-in-out" style="text-decoration: none; min-width: 280px;">
+        <h3 class="h4 fw-medium mn-b-thin">Votings</h3>
+        <p class="t-dark">Community decisions and polls</p>
       </router-link>
     </div>
   </div>
 </template>
-
-<script setup>
-</script>
-
-<style lang="scss" scoped>
-a {
-  text-decoration: none;
-  color: inherit;
-}
-</style>