@ozdao/prometheus-framework 0.2.60 → 0.2.62

package/src/modules/auth/auth.server.js

@@ -1,24 +1,19 @@
 // Importing controllers
 const AuthController = require('./controllers/auth.controller.js');
 const TwoFaController = require('./controllers/twofa.controller.js');
-const InvitesController = require('./controllers/invites.controller.js');
 
 // Importing routes
-const invitesRoutes = require('./routes/invites.routes.js');
 const authRoutes = require('./routes/auth.routes.js');
 const twofaRoutes = require('./routes/twofa.routes.js');
 // Importing models (assuming they are also in CommonJS format)
 const RoleModel = require('./models/role.model.js');
-const InviteModel = require('./models/invite.model.js');
+
 
 // Exporting
 module.exports = {
   AuthController,
   TwoFaController,
-  InvitesController,
-  invitesRoutes,
   authRoutes,
   twofaRoutes,
   RoleModel,
-  InviteModel,
 };

package/src/modules/auth/components/pages/Invite.vue

@@ -43,7 +43,7 @@ import { computed, onMounted, ref, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 // Import state
 import * as auth 		from '@pf/src/modules/auth/store/auth'
-import * as invites from '@pf/src/modules/auth/store/invites'
+import * as invites from '@pf/src/modules/organizations/store/invites'
 // Import validation
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
 const passswordValidation = ref(null)

package/src/modules/events/components/pages/EditEvent.vue

@@ -21,6 +21,25 @@
       class="mn-b-semi w-100 bg-grey pd-medium radius-small" 
     />
 
+    <h3
+      v-if="(auth.state.access.roles) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
+      class="mn-b-small"
+    >
+      Tickets
+    </h3>
+
+     <div 
+      v-if="(auth.state.access.roles) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
+      class="mn-b-semi w-100 bg-grey pd-medium radius-small"
+      @click="router.push({
+        name: 'Edit Event Tickets',
+        params: {
+          url: route.params.url
+        }
+      })"
+    >
+      Edit tickets
+    </div>
   
     <h3
       v-if="(auth.state.access.roles) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"

package/src/modules/events/components/pages/EditEventTickets.vue

@@ -0,0 +1,194 @@
+<template>
+  <article v-if="event" class="h-100 pd-thin">
+    <header 
+      class="mn-b-medium flex-v-center flex-nowrap flex"
+    >
+      <h2 class="mn-r-medium">Tickets</h2>
+      <button 
+        @click="openTicketsPopup()" 
+        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
+          +
+      </button>
+    </header>
+    
+    <Popup 
+      title="Добавить участника" 
+      @close-popup="closeTicketsPopup" 
+      :isPopupOpen="isOpenTicketsPopup"
+      class="w-max-40r"
+    >
+      <Block
+        title="Add tickets"
+        placeholder="No parameters added yet"
+        :actions="[{
+          label: '+',
+          function: () => newTickets.push({name: '', value: '', target: event._id, type: 'event'})
+        }]"
+        class="cols-1 mn-b-thin gap-thin"
+      >
+        <div 
+          class="gap-thin flex-nowrap flex" 
+          v-for="(item, index) in newTickets" 
+          :key="index"
+        > 
+          <Field
+            v-model:field="item.name"
+            placeholder="Name"
+            class="w-30 bg-white radius-small pd-medium"
+          />  
+          <Field
+            v-model:field="item.email"
+            placeholder="Email"
+            class="w-100 bg-white radius-small pd-medium"
+          />
+          <div v-if="index > 0" @click="() => newTickets.splice(index, 1)"  class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red">
+            <IconDelete 
+              class="i-medium"
+            />
+          </div>
+        </div>
+
+         <Button 
+            :submit="onSubmit" 
+            :callback="closeTicketsPopup" 
+            class="w-100 bg-black t-white"
+          >
+            Create Tickets
+          </Button>
+      </Block>
+    </Popup>
+
+    <Feed
+      :states="{
+        empty: {
+          title: 'No Tickets Found',
+          description: 'Currently, there are no tickets.'
+        }
+      }"
+      :store="{
+        read: (options) => tickets.actions.read(options),
+        state: null
+      }"
+      :options="{
+        target: event._id
+      }"
+      v-slot="{ 
+        items 
+      }"
+    >
+      <div
+        v-for="(ticket, index) in items" 
+        class="radius-big bg-grey gap-small pd-small flex-nowrap flex pos-relative mn-b-thin"
+      >
+
+        <img :src="ticket.image" class="radius-small h-5r w-5r">
+
+        <div class="">
+           <p class="h4">
+            {{ticket.client_refactor?.name || 'No name'}}, {{ticket.role}}
+           </p>
+          <p class="h5 t-transp mn-b-thin">
+            {{ticket.client_refactor?.email || 'No email'}}
+          </p>
+
+           <span class="pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+            {{ticket.status}}
+          </span>
+        </div>
+
+        <Button 
+          :submit="onSubmit" 
+          :callback="redirectTo" 
+          class="w-min h-min mn-l-auto bg-black t-white"
+        >
+          Deactivate
+        </Button>
+      
+      </div>
+    </Feed>
+    
+  </article>
+</template>
+
+<script setup>
+import Feed from '@pf/src/components/Feed/Feed.vue';
+import Block from '@pf/src/components/Block/Block.vue';
+import Popup from "@pf/src/components/Popup/Popup.vue";
+import Field         from '@pf/src/components/Field/Field.vue'
+import Button from '@pf/src/components/Button/Button.vue';   
+
+import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
+
+import { ref, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import * as events from '@pf/src/modules/events/store/events.js';
+import * as auth from '@pf/src/modules/auth/store/auth';
+import * as organizations from '@pf/src/modules/organizations/store/organizations';
+
+import * as tickets from '@pf/src/modules/events/store/tickets';
+
+const route = useRoute();
+const router = useRouter();
+
+let event = ref(null);
+
+const newTickets = ref([{
+  name: '',
+  email: '',
+  target: event.value?._id, 
+  type: 'event'
+}])
+
+const isOpenTicketsPopup = ref(false);
+
+function openTicketsPopup(department) {
+  isOpenTicketsPopup.value = true;
+  
+  newTickets.value = [{
+    name: '',
+    email: '',
+    target: event.value?._id, 
+    type: 'event'
+  }]
+}
+
+function closeTicketsPopup() {
+  isOpenTicketsPopup.value = false;
+}
+
+
+onMounted(async () =>{
+  const data = await events.read({ user: auth.state.user._id, url: route.params.url });
+
+  event.value = data.pop();
+})
+
+async function onSubmit() {
+  try {
+    const response = await tickets.actions.create(newTickets.value);
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+async function onDeactivate() {
+  if (confirm('Are you sure you want to deactivate this event?')) {
+    try {
+      const response = await events.update(event.value._id);
+    } catch (error) {
+      console.error(error);
+    }
+  }
+}
+
+</script>
+
+<style lang="scss">
+  .dp__input {
+    border: 0;
+    padding: var(--medium);
+    padding-left: 3rem;
+    background: rgb(var(--grey))
+  }
+</style>

package/src/modules/events/controllers/tickets.controller.js

@@ -1,8 +1,110 @@
 const QRCode = require("qrcode");
+const Jimp = require('jimp');
+const path = require('path');
 
-const controllerFactory = (db) => {
+const { sendEmail } = require('@pf/src/modules/globals/utils/mailing');
+
+const controllerFactory = (db, publicPath) => {
   const Ticket = db.ticket;
 
+  // Функция для создания билета, генерации QR-кода и сохранения билета
+  async function saveAndSendTicket(ticketData) {
+    console.log(ticketData);
+    const ticket = new Ticket(ticketData);
+
+    const data = await ticket.save();
+
+    // Работа с QR-кодом
+    const qrData = data._id.toString();
+    const qrCode = await QRCode.toDataURL(qrData, { errorCorrectionLevel: 'H', type: 'image/png' });
+
+    data.status = "unused";
+    data.qrcode = qrCode;
+
+    data.client_refactor.name = ticketData.name
+    data.client_refactor.email = ticketData.email
+
+    // Путь к шаблону билета и куда сохранить измененный
+    const templatePath = path.join(publicPath, 'tickets', 'template.png');
+    const outputPath = path.join(publicPath, 'tickets', `ticket-${data._id}.png`);
+    data.image = `/tickets/ticket-${data._id}.png`;
+
+    // Загрузка шаблона билета
+    const ticketTemplate = await Jimp.read(templatePath);
+
+    // Генерация QR-кода в виде изображения
+    const qrImage = await Jimp.read(Buffer.from(qrCode.split(",")[1], 'base64'));
+
+    const resizedQrWidth = qrImage.bitmap.width * 1.5;
+    const resizedQrHeight = qrImage.bitmap.height * 1.5;
+    qrImage.resize(resizedQrWidth, resizedQrHeight);
+
+    // Вычисление позиции для QR-кода после изменения размера
+    const { width: templateWidth, height: templateHeight } = ticketTemplate.bitmap;
+    
+    const xPosition = (templateWidth - resizedQrWidth) / 2;
+    const yPosition = (templateHeight / 2 - resizedQrHeight / 2) + 275; // Немного ниже центра
+
+    // Добавление QR-кода на шаблон билета
+    await ticketTemplate.composite(qrImage, xPosition, yPosition);
+
+    // Сохранение измененного билета
+    await ticketTemplate.writeAsync(outputPath);
+
+    if (ticketData.email) {
+      const emailBody = `
+        <h1>Your Ticket from ${process.env.APP_NAME}</h1>
+        <p>Dear ${ticketData.name || 'Anonymous'},<br>
+        Your ticket is now ready.<br>
+        Please find your ticket attached below:</p>
+        <img src="${process.env.API_URL + data.image}" alt="Ticket Image" style="width:100%;max-width:600px;height:auto;">
+        Keep this ticket safe, and show the QR code at the entrance.<br>
+        Looking forward to seeing you!<br>
+        Best regards,<br>
+        <p>The ${process.env.APP_NAME} Team</p>
+      `;
+
+      try {
+        const emailSent = await sendEmail(ticketData.email, `Your Ticket from ${process.env.APP_NAME}`, emailBody);
+      } catch(err){
+        console.log(err)
+      } 
+    }
+
+    // Обновление билета с сгенерированным QR-кодом
+    await data.save();
+
+    return data; // Возвращаем данные для дальнейшего использования
+  }
+
+  const create = async (req, res) => {
+    // Проверяем, является ли тело запроса массивом
+    if (Array.isArray(req.body)) {
+      // Если тело запроса - массив, обрабатываем каждый элемент массива
+      const ticketsData = req.body;
+
+      try {
+        const ticketsPromises = ticketsData.map(ticketData =>
+          saveAndSendTicket(ticketData)
+        );
+        const tickets = await Promise.all(ticketsPromises);
+        res.json(tickets); // Отправляем массив сохраненных билетов
+      } catch (err) {
+          console.log(err)
+        res.status(500).send({ errorCode: "SERVER_ERROR" });
+      }
+    } else {
+      // Если тело запроса не массив, обрабатываем как один объект
+      try {
+        const data = await saveAndSendTicket(req.body);
+        res.json(data); // Отправляем данные одного билета
+      } catch (err) {
+        console.log(err)
+        res.status(500).send({ errorCode: "SERVER_ERROR" });
+      }
+    }
+  };
+
   const read = async (req, res) => {
     let query = {};
     let options = {};
@@ -34,33 +136,6 @@ const controllerFactory = (db) => {
     }
   };
 
-  const create = async (req, res) => {
-    const newTicket = new Ticket({
-      user: req.body.user,
-      type: req.body.type,
-      target: req.body.target,
-      role: req.body.role
-    });
-
-    try {
-      const data = await newTicket.save();
-
-      // Working with qrcode
-      const qrData = data._id.toString();
-      const qrCode = await QRCode.toDataURL(qrData);
-
-      data.status = "unused";
-      data.qrcode = qrCode;
-
-      // Updated ticked with generated qrcode
-      await data.save();
-
-      res.send(data);
-    } catch (err) {
-      res.status(500).send({ errorCode: "SERVER_ERROR" });
-    }
-  };
-
   const update = async (req, res) => {
     try {
       const { _id } = req.body;

package/src/modules/events/models/ticket.model.js

@@ -1,17 +1,28 @@
 module.exports = (mongoose) => {
   const TicketSchema = new mongoose.Schema({
+    client: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Client',
+    },
+    client_refactor: {
+      email: {
+        type: String,
+      },
+      name: {
+        type: String,
+      },
+    },
     user: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'User',
-      required: true,
     },
     type: {
       type: String,
       enum: ['event','parking'], 
-      default: 'organization',
+      default: 'event',
       required: true,
     },
-    target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
+    target: {  
       type: mongoose.Schema.Types.ObjectId,
       ref: function (value) {
         if (this.type === 'event') return 'Event';
@@ -26,11 +37,18 @@ module.exports = (mongoose) => {
     qrcode: {
       type: String,
     },
+    image: {
+      type: String,
+    },
     status: {
       type: String,
-      enum: ["unused", "used"],
+      enum: ["unused", "used","deactivated"],
       deafult: "unused",
     },
+  }, {
+    timestamps: { 
+      currentTime: () => Date.now() 
+    }
   });
 
   TicketSchema.index({ user: 1, type: 1, target: 1 });

package/src/modules/events/router/events.js

@@ -50,6 +50,11 @@ const eventsRoutes = [
     name: 'Edit Event',
     meta: { authorize: [] },
     component: () => import(/* webpackChunkName: 'EditEvent' */ '../components/pages/EditEvent.vue')
+  },{
+    path: 'events/:url/edit/tickets',
+    name: 'Edit Event Tickets',
+    meta: { authorize: [] },
+    component: () => import(/* webpackChunkName: 'EditEvent' */ '../components/pages/EditEventTickets.vue')
   }
 ];
 

package/src/modules/events/routes/tickets.routes.js

@@ -1,8 +1,8 @@
 // Factories
 const controllerFactory = require("../controllers/tickets.controller");
 // Routes
-module.exports = function(app, db, origins) {
-  const controller = controllerFactory(db);
+module.exports = function(app, db, origins, publicPath) {
+  const controller = controllerFactory(db, publicPath);
 
   app.use(function(req, res, next) {
     

package/src/modules/events/store/tickets.js

@@ -22,6 +22,7 @@ const state = reactive({
 // Methods
 const actions = {
   async read({ user, type, target, role }) {
+    
     try {
       const response = await $axios.get(`/api/tickets`, { params: { user, type, target, role } });
       state.error = null;

package/src/modules/globals/components/blocks/CardHeader.vue

@@ -11,7 +11,7 @@
 				class="w-100 flex-nowrap flex-v-center flex"
 			>
 				<img 
-					v-if="owner.target.profile.photo?.length > 0 && type !== 'short'" 
+					v-if="owner.target?.profile?.photo?.length > 0 && type !== 'short'" 
 					:src="(FILE_SERVER_URL || '') + owner.target.profile.photo" 
 					class="radius-medium object-fit-cover mn-r-thin i-thin" 
 
@@ -24,7 +24,7 @@
 				/>
 
 				<PlaceholderUserpic
-					v-if="!owner.target.profile.photo && type !== 'short'"
+					v-if="!owner.target?.profile?.photo && type !== 'short'"
 					class="radius-medium mn-r-thin i-thin"
 
 					@click.stop="$router.push({
@@ -48,19 +48,19 @@
 							}
 						})" 
 					>
-						{{owner.target.profile.name}}
+						{{owner.target?.profile?.name}}
 					</span>
 
 					<span
-						v-if="!creator.hidden && owner.target.profile.name !== creator.target.profile?.name"
+						v-if="!creator.hidden && owner.target?.profile?.name !== creator.target?.profile?.name"
 						@click.stop="$router.push({
 							name: 'User Profile', 
 							params: {
-								_id: creator.target._id
+								_id: creator.target?._id
 							}
 						})" 
 					>
-						· by {{creator.target.profile?.name}}
+						· by {{creator.target?.profile?.name}}
 					</span>
 					<span v-if="date">
 						· {{getTimeElapsed(date)}}

package/src/modules/organizations/components/pages/Members.vue

@@ -81,7 +81,7 @@ import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 
 
 import * as auth      from '@pf/src/modules/auth/store/auth'
-import * as invites from '@pf/src/modules/auth/store/invites';
+import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'
 import * as departments from '@pf/src/modules/organizations/store/departments';

package/src/modules/organizations/components/pages/Organization.vue

@@ -26,13 +26,13 @@
 	        }
 	      }"
 	      :store="{
-	        read: (options) => departments.actions.read(route.params._id),
+	        read: (options) => departments.actions.read(options),
 	        state: null
 	      }"
 	      :options="{
-	          user: auth.state.user._id,
-	          sort: 'numberOfMemberships',
-	          limit: 10
+      		organization: route.params._id,
+          user: auth.state.user._id,
+          hidden: false,
 	      }"
 	      v-slot="{ 
 	        items 

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -58,7 +58,7 @@
   import Button   from '@pf/src/components/Button/Button.vue'
   // Import validation
   import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-  import * as invites from '@pf/src/modules/auth/store/invites';
+  import * as invites from '@pf/src/modules/organizations/store/invites';
   // Props
   const props = defineProps({
     organization: Object,

package/src/modules/organizations/controllers/departments.controller.js

@@ -17,7 +17,20 @@ const controllerFactory = (db) => {
   };
 
   const read = (req, res) => {
-    Department.find({ organization: req.params._id })
+   let query = {};
+   let options = {};
+
+   console.log(req.query)
+    
+    if (req.query.organization) {
+      query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
+    }
+
+    if (req.query.hidden) {
+      query.hidden = req.query.hidden;
+    }
+
+    Department.find(query, null, options)
       .populate('members.user')
       .populate('subdepartments')
       .then(departments => {

package/src/modules/organizations/models/department.model.js

@@ -21,7 +21,11 @@ module.exports = (mongoose) => {
         start: String,
         end: String
       }
-    }],
+    }],   
+    hidden: {
+      type: Boolean,
+      default: false,
+    },
     // Marketplace options
     delivery: [String],
     payment: [String],

package/src/modules/organizations/organizations.client.js

@@ -30,6 +30,7 @@ import ButtonToggleMembership from './components/elements/ButtonToggleMembership
 import * as departmentsStore from './store/departments.js';
 import * as membershipsStore from './store/memberships.js';
 import * as organizationStore from './store/organizations.js';
+import * as invitesStore from './store/invites.js';
 
 // Import Vue Router routes
 import organizationsRouter from './router/organizations.js';
@@ -61,6 +62,7 @@ ButtonToggleMembership,
 departmentsStore,
 membershipsStore,
 organizationStore,
+invitesStore,
 organizationsRouter
 };
 

package/src/modules/organizations/organizations.server.js

@@ -2,26 +2,30 @@
 const DepartmentsController = require('./controllers/departments.controller.js');
 const OrganizationsController = require('./controllers/organizations.controller.js');
 const MembershipsController = require('./controllers/memberships.controller.js');
-
+const InvitesController = require('./controllers/invites.controller.js');
 // Importing routes
 const departmentsRoutes = require('./routes/departments.routes.js');
 const organizationsRoutes = require('./routes/organizations.routes.js');
 const membershipsRoutes = require('./routes/memberships.routes.js');
-
+const invitesRoutes = require('./routes/invites.routes.js')
 // Importing models
 const DepartmentModel = require('./models/department.model.js');
 const OrganizationModel = require('./models/organization.model.js');
 const MembershipModel = require('./models/membership.model.js');
+const InviteModel = require('./models/invite.model.js');
 
 // Exporting
 module.exports = {
   DepartmentsController,
   OrganizationsController,
   MembershipsController,
+  InvitesController,
   departmentsRoutes,
   organizationsRoutes,
   membershipsRoutes,
+  invitesRoutes,
   DepartmentModel,
   OrganizationModel,
   MembershipModel,
+  InviteModel
 };

package/src/modules/organizations/routes/departments.routes.js

@@ -14,7 +14,7 @@ module.exports = function(app, db) {
   });
 
   // Get organization departments by _id
-  app.get("/api/departments/:_id", controller.read);
+  app.get("/api/departments/read", controller.read);
 
   // Get department by _id
   app.get("/api/departments/get/:_id", controller.readOne);

package/src/modules/organizations/store/departments.js

@@ -48,9 +48,10 @@ const actions = {
     }
   },
 
-  async read(organizationId) {
+  async read(options) {
     try {
-      const response = await $axios.get(`/api/departments/${organizationId}`);
+      const response = await $axios.get(`/api/departments/read`, { params: options });
+
       console.log('Response:', response);
       state.departments = response.data;
       state.error = null;