@ozdao/prometheus-framework 0.2.323 → 0.2.324

package/src/modules/governance/controllers/routes/votes.routes.js

@@ -1,4 +1,4 @@
-const voteFactory = require("../controllers/votes.controller");
+const voteFactory = require("../factories/votes.controller");
 
 module.exports = function(app, db, origins, publicPath) {
   const controller = voteFactory(db);

package/src/modules/governance/controllers/routes/votings.routes.js

@@ -1,4 +1,4 @@
-const votingFactory = require("../controllers/votings.controller");
+const votingFactory = require("../factories/votings.controller");
 
 module.exports = function(app, db, origins, publicPath) {
   const controller = votingFactory(db);

package/src/modules/governance/governance.client.js

@@ -1,21 +1,22 @@
-import * as storeInitiatives from './store/initiatives.js';
-import * as storeTasks from './store/tasks.js';
-import * as storeVotings from './store/votings.js';
-import * as storeRewards from './store/rewards.js';
+import * as storeInitiatives from './views/store/initiatives.js';
+import * as storeTasks from './views/store/tasks.js';
+import * as storeVotings from './views/store/votings.js';
+import * as storeVotes from './views/store/votes.js';
 
 // Router
-import routerGovernance from './router/governance.router.js';
+import { createGovernanceRoutes } from './views/router/goverance.router';
 
 // Example initialization function for the Governance module
 function initializeGovernance(app, store, router, options = {}) {
   const route = options.route || 'Home';
-  
-  router.addRoute(route, routerGovernance);
+  const routesGovernance = createGovernanceRoutes('', options);
+
+  router.addRoute(route, routesGovernance);
   
   store.addStore('initiatives', storeInitiatives);
   store.addStore('tasks', storeTasks);
   store.addStore('votings', storeVotings);
-  store.addStore('rewards', storeRewards);
+  store.addStore('votes', storeVotes);
 }
 
 const ModuleGovernance = {
@@ -26,36 +27,35 @@ const ModuleGovernance = {
       storeTasks,
       storeVotings,
       storeVotes,
-      storeRewards
     },
     router: {
-      routerGovernance
+      createGovernanceRoutes
     },
-    components: {
-      // Pages
-      Initiatives,
-      Initiative,
-      InitiativeCreate,
-      Tasks,
-      Task,
-      TaskCreate,
-      Votings,
-      Voting,
-      VotingCreate,
-      // Blocks
-      CardInitiativeItem,
-      CardTaskItem,
-      CardVotingItem,
-      // Sections
-      FormInitiativeDetails,
-      FormTaskDetails,
-      FormVotingDetails,
-      VoteForm,
-      // Partials
-      RewardDisplay,
-      VotingResult,
-      VoteDisplay,
-    }
+    // components: {
+    //   // Pages
+    //   Initiatives,
+    //   Initiative,
+    //   InitiativeCreate,
+    //   Tasks,
+    //   Task,
+    //   TaskCreate,
+    //   Votings,
+    //   Voting,
+    //   VotingCreate,
+    //   // Blocks
+    //   CardInitiativeItem,
+    //   CardTaskItem,
+    //   CardVotingItem,
+    //   // Sections
+    //   FormInitiativeDetails,
+    //   FormTaskDetails,
+    //   FormVotingDetails,
+    //   VoteForm,
+    //   // Partials
+    //   RewardDisplay,
+    //   VotingResult,
+    //   VoteDisplay,
+    // }
   }
 }
 

package/src/modules/governance/governance.server.js

@@ -4,15 +4,15 @@ const ModelTask = require('./models/task.model.js');
 const ModelVoting = require('./models/voting.model.js');
 const ModelVote = require('./models/vote.model.js');
 
-const RoutesInitiative = require('./routes/initiatives.routes.js');
-const RoutesTask = require('./routes/tasks.routes.js');
-const RoutesVoting = require('./routes/votings.routes.js');
-const RoutesVote = require('./routes/votes.routes.js');
+const RoutesInitiative = require('./controllers/routes/initiatives.routes.js');
+const RoutesTask = require('./controllers/routes/tasks.routes.js');
+const RoutesVoting = require('./controllers/routes/votings.routes.js');
+const RoutesVote = require('./controllers/routes/votes.routes.js');
 
-const FactoryInitiative = require('./controllers/initiatives.controller.js');
-const FactoryTask = require('./controllers/tasks.controller.js');
-const FactoryVoting = require('./controllers/votings.controller.js');
-const FactoryVote = require('./controllers/votes.controller.js');
+const FactoryInitiative = require('./controllers/factories/initiatives.controller.js');
+const FactoryTask = require('./controllers/factories/tasks.controller.js');
+const FactoryVoting = require('./controllers/factories/votings.controller.js');
+const FactoryVote = require('./controllers/factories/votes.controller.js');
 
 const CRUD = require('@pf/src/modules/globals/controllers/classes/globals.crud');
 

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

@@ -0,0 +1,98 @@
+module.exports = (db) => {
+  const MilestoneSchema = new db.mongoose.Schema({
+    name: { 
+      type: String, 
+      required: true 
+    },
+    description: { 
+      type: String 
+    },
+    status: { 
+      type: String,
+      enum: ['not_started', 'in_progress', 'completed', 'blocked', 'cancelled'],
+      default: 'not_started'
+    },
+    startDate: { 
+      type: Date,
+      required: true 
+    },
+    dueDate: { 
+      type: Date,
+      required: true 
+    },
+    completedDate: { 
+      type: Date 
+    },
+    progress: {
+      type: Number,
+      min: 0,
+      max: 100,
+      default: 0
+    },
+    owner: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User',
+      required: true
+    },
+    contributors: [{
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User'
+    }],
+    initiative: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'Initiative',
+      required: true
+    },
+    priority: {
+      type: String,
+      enum: ['low', 'medium', 'high', 'urgent'],
+      default: 'medium'
+    },
+    tags: [{
+      type: String
+    }],
+    dependencies: [{
+      milestone: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'Milestone'
+      },
+      type: {
+        type: String,
+        enum: ['blocks', 'blocked_by', 'related_to'],
+        required: true
+      }
+    }],
+    metadata: {
+      estimatedHours: Number,
+      actualHours: Number,
+      budget: Number,
+      actualCost: Number,
+      notes: String
+    }
+  }, {
+    timestamps: { 
+      currentTime: () => Date.now() 
+    },
+    toJSON: { virtuals: true },
+    toObject: { virtuals: true }
+  });
+
+  // Virtuals
+  MilestoneSchema.virtual('isOverdue').get(function() {
+    return this.dueDate && this.dueDate < new Date() && this.status !== 'completed';
+  });
+
+  MilestoneSchema.virtual('duration').get(function() {
+    return this.dueDate ? Math.ceil((this.dueDate - this.startDate) / (1000 * 60 * 60 * 24)) : null;
+  });
+
+  // Indexes
+  MilestoneSchema.index({ initiative: 1, status: 1 });
+  MilestoneSchema.index({ owner: 1 });
+  MilestoneSchema.index({ dueDate: 1 });
+  MilestoneSchema.index({ 'dependencies.milestone': 1 });
+
+  const Milestone = db.mongoose.model('Milestone', MilestoneSchema);
+  
+  return Milestone;
+};

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

@@ -1,21 +1,53 @@
 module.exports = (db) => {
   const TaskSchema = new db.mongoose.Schema({
-    title: { type: String, required: true },
-    description: { type: String },
+    title: { 
+      type: String, 
+      required: true 
+    },
+    description: { 
+      type: String 
+    },
     status: { 
       type: String, 
-      enum: ['pending', 'in_progress', 'completed'],
-      default: 'pending'
+      enum: ['not_started', 'in_progress', 'completed', 'blocked', 'cancelled'],
+      default: 'not_started'
     },
     assignedTo: { 
       type: db.mongoose.Schema.Types.ObjectId, 
       ref: 'User' 
     },
-    dueDate: { type: Date },
+    dueDate: { 
+      type: Date 
+    },
+    // Reference to milestone
+    milestone: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'Milestone'
+    },
     initiative: {
       type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Initiative'
-    }
+    },
+    // Added priority
+    priority: {
+      type: String,
+      enum: ['low', 'medium', 'high', 'urgent'],
+      default: 'medium'
+    },
+    // Added tags
+    tags: [{
+      type: String
+    }]
   }, {
     timestamps: { currentTime: () => Date.now() }
-  });
+  });
+
+  // Add indexes
+  TaskSchema.index({ milestone: 1 });
+  TaskSchema.index({ assignedTo: 1 });
+  TaskSchema.index({ status: 1 });
+  TaskSchema.index({ dueDate: 1 });
+
+  const Task = db.mongoose.model('Task', TaskSchema);
+  return Task;
+};

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

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { initiativesActions, initiativesState } from '../store/initiatives';
+import { initiativesActions, initiativesState } from '../../store/initiatives';
 
 const route = useRoute();
 const initiative = ref(null);

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

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
-import { initiativesActions } from '../store/initiatives';
-import FormInitiativeDetails from './FormInitiativeDetails.vue';
+import { initiativesActions } from '../../store/initiatives';
+import FormInitiativeDetails from '../sections/FormInitiativeDetails.vue';
 
 const newInitiative = ref({
   name: '',

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

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { initiativesActions, initiativesState } from '../store/initiatives';
-import CardInitiativeItem from './CardInitiativeItem.vue';
+import { initiativesActions, initiativesState } from '../../store/initiatives';
+import CardInitiativeItem from '../blocks/CardInitiativeItem.vue';
 
 const initiatives = ref([]);
 
@@ -14,6 +14,7 @@ onMounted(async () => {
 <template>
   <div>
     <h1>Initiatives</h1>
+    <router-link :to="{name:'Create Initiative' }">Create Initiative</router-link>
     <CardInitiativeItem v-for="initiative in initiatives" :key="initiative.id" :initiative="initiative" />
   </div>
 </template>

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

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { tasksActions, tasksState } from '../store/tasks';
+import { tasksActions, tasksState } from '../../store/tasks';
 
 const route = useRoute();
 const task = ref(null);

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

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
-import { tasksActions } from '../store/tasks';
-import FormTaskDetails from './FormTaskDetails.vue';
+import { tasksActions } from '../../store/tasks';
+import FormTaskDetails from '../sections/FormTaskDetails.vue';
 
 const newTask = ref({
   name: '',

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

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { tasksActions, tasksState } from '../store/tasks';
-import CardTaskItem from './CardTaskItem.vue';
+import { tasksActions, tasksState } from '../../store/tasks';
+import CardTaskItem from '../blocks/CardTaskItem.vue';
 
 const tasks = ref([]);
 

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

@@ -1,9 +1,9 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { votingsActions, votingsState } from '../store/votings';
-import VoteForm from './VoteForm.vue';
-import VotingResult from './VotingResult.vue';
+import { votingsActions, votingsState } from '../../store/votings';
+import VoteForm from '../sections/VoteForm.vue';
+import VotingResult from '../partials/VotingResult.vue';
 
 const route = useRoute();
 const voting = ref(null);

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

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
-import { votingsActions } from '../store/votings';
-import FormVotingDetails from './FormVotingDetails.vue';
+import { votingsActions } from '../../store/votings';
+import FormVotingDetails from '../sections/FormVotingDetails.vue';
 
 const newVoting = ref({
   title: '',

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

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { votingsActions, votingsState } from '../store/votings';
-import CardVotingItem from './CardVotingItem.vue';
+import { votingsActions, votingsState } from '../../store/votings';
+import CardVotingItem from '../blocks/CardVotingItem.vue';
 
 const votings = ref([]);
 

package/src/modules/governance/views/components/sections/VoteForm.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { defineProps } from 'vue';
-import { votesActions } from '../store/votes';
+import { votesActions } from '../../store/votes';
 
 const props = defineProps({
   votingId: {

package/src/modules/governance/views/router/goverance.router.js

@@ -0,0 +1,263 @@
+import { defineAsyncComponent } from 'vue'
+
+import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
+
+export function createGovernanceRoutes(prefix = '', options = {}) {
+  const nameWithPrefix = (name) => prefix ? `${prefix}${name}` : name;
+
+  const routes = {
+    path: options.basePath || 'governance',
+    meta: {
+      title: {
+        en: 'Governance',
+        ru: 'Управление'
+      },
+      title_hide: true
+    },
+    children: [
+      // Initiatives routes
+      {
+        path: 'initiatives',
+        name: nameWithPrefix('Initiatives'),
+        meta: {
+          title: {
+            en: 'Initiatives',
+            ru: 'Инициативы'
+          },
+          title_hide: false
+        },
+        children: [
+          {
+            path: '',
+            name: nameWithPrefix('Initiatives'),
+            meta: {
+              title: {
+                en: 'Initiatives',
+                ru: 'Инициативы'
+              },
+              title_hide: false
+            },
+            component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/Initiatives.vue'),
+          },
+          {
+            path: 'create',
+            name: nameWithPrefix('Create Initiative'),
+            meta: {
+              title: {
+                en: 'Create Initiative',
+                ru: 'Создать Инициативу'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/InitiativeCreate.vue')
+          },
+          {
+            path: ':id',
+            name: nameWithPrefix('Initiative'),
+            meta: {
+              title: {
+                en: 'Initiative',
+                ru: 'Инициатива'
+              },
+              title_hide: false
+            },
+            component: options.page_initiative || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/Initiative.vue')
+            )
+          },
+          {
+            path: ':id/edit',
+            name: nameWithPrefix('Edit Initiative'),
+            meta: {
+              title: {
+                en: 'Edit Initiative',
+                ru: 'Редактировать Инициативу'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: options.page_initiative_edit || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/InitiativeCreate.vue')
+            )
+          }
+        ]
+      },
+
+      // Tasks routes
+      {
+        path: 'tasks',
+        name: nameWithPrefix('Tasks'),
+        meta: {
+          title: {
+            en: 'Tasks',
+            ru: 'Задачи'
+          },
+          title_hide: false
+        },
+        component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/Tasks.vue'),
+        children: [
+          {
+            path: 'create',
+            name: nameWithPrefix('Create Task'),
+            meta: {
+              title: {
+                en: 'Create Task',
+                ru: 'Создать Задачу'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/TaskCreate.vue')
+          },
+          {
+            path: ':id',
+            name: nameWithPrefix('Task'),
+            meta: {
+              title: {
+                en: 'Task',
+                ru: 'Задача'
+              },
+              title_hide: false
+            },
+            component: options.page_task || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/Task.vue')
+            )
+          },
+          {
+            path: ':id/edit',
+            name: nameWithPrefix('Edit Task'),
+            meta: {
+              title: {
+                en: 'Edit Task',
+                ru: 'Редактировать Задачу'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: options.page_task_edit || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/TaskCreate.vue')
+            )
+          }
+        ]
+      },
+
+      // Votings routes
+      {
+        path: 'votings',
+        name: nameWithPrefix('Votings'),
+        meta: {
+          title: {
+            en: 'Votings',
+            ru: 'Голосования'
+          },
+          title_hide: false
+        },
+        component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/Votings.vue'),
+        children: [
+          {
+            path: 'create',
+            name: nameWithPrefix('Create Voting'),
+            meta: {
+              title: {
+                en: 'Create Voting',
+                ru: 'Создать Голосование'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: () => import(/* webpackChunkName: 'Governance' */ '../components/pages/VotingCreate.vue')
+          },
+          {
+            path: ':id',
+            name: nameWithPrefix('Voting'),
+            meta: {
+              title: {
+                en: 'Voting',
+                ru: 'Голосование'
+              },
+              title_hide: false
+            },
+            component: options.page_voting || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/Voting.vue')
+            )
+          },
+          {
+            path: ':id/edit',
+            name: nameWithPrefix('Edit Voting'),
+            meta: {
+              title: {
+                en: 'Edit Voting',
+                ru: 'Редактировать Голосование'
+              },
+              title_hide: false
+            },
+            beforeEnter: [
+              validationAuth.requiresAuth,
+            ],
+            component: options.page_voting_edit || defineAsyncComponent(() => 
+              import(/* webpackChunkName: 'Governance' */ '../components/pages/VotingCreate.vue')
+            )
+          },
+        ]
+      }
+    ]
+  };
+
+  return routes;
+}
+
+// Navigation guards
+export function setupGovernanceNavigationGuards(router) {
+  // Check voting status before allowing votes or edits
+  router.beforeEach(async (to, from, next) => {
+    if (to.name?.includes('Voting') && to.params.id) {
+      try {
+        const response = await fetch(`/api/votings/${to.params.id}`);
+        const voting = await response.json();
+        
+        // Prevent voting on closed votings
+        if (voting.status === 'closed' && to.name?.includes('Edit')) {
+          next({ name: 'Votings' });
+          return;
+        }
+      } catch (error) {
+        console.error('Error checking voting status:', error);
+      }
+    }
+    next();
+  });
+
+  // Check initiative status before allowing edits
+  router.beforeEach(async (to, from, next) => {
+    if (to.name?.includes('Initiative') && to.params.id && to.name?.includes('Edit')) {
+      try {
+        const response = await fetch(`/api/initiatives/${to.params.id}`);
+        const initiative = await response.json();
+        
+        // Only allow editing draft initiatives
+        if (initiative.status !== 'draft') {
+          next({ name: 'Initiatives' });
+          return;
+        }
+      } catch (error) {
+        console.error('Error checking initiative status:', error);
+      }
+    }
+    next();
+  });
+}
+
+// Example usage:
+// const governanceRoutes = createGovernanceRoutes('Admin', { basePath: 'admin/governance' });
+// export { governanceRoutes, setupGovernanceNavigationGuards };