@ozdao/prometheus-framework 0.2.57 → 0.2.59

package/src/modules/backoffice/router/backoffice.js

@@ -76,60 +76,6 @@ const backofficeRoutes = [{
       authorize: []
     },
     component: () => import(/* webpackChunkName: 'BackofficeCommunity' */ '@pf/src/modules/community/components/pages/Community.vue'),
-  },{
-    path: 'products',
-    name: 'Backoffice Products',
-    meta: {
-      title: {
-        en: 'Backoffice Products',
-        ru: 'Управление Продуктами'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeProducts' */ '@pf/src/modules/products/components/pages/ProductsBackoffice.vue'),
-  },{
-    path: 'products/add',
-    name: 'Backoffice AddProduct',
-    component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-  },{
-    path: 'products/:product',
-    name: 'Backoffice ProductEdit',
-    beforeEnter: [validationAuth.requiresAuth],
-    component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-  },{
-    path: 'leftovers',
-    name: 'Backoffice Leftovers',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeLeftovers' */ '@pf/src/modules/products/components/pages/Leftovers.vue'),
-},{
-    path: 'leftovers/add',
-    name: 'Backoffice LeftoverAdd',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers Add',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-  },
-  {
-    path: 'leftovers/:leftover',
-    name: 'Backoffice LeftoverEdit',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers Edit',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
   },
   {
     path: 'orders',
@@ -141,15 +87,26 @@ const backofficeRoutes = [{
       },
       authorize: []
     },
-    component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/Orders.vue'),
-  },{
-    path: 'orders/add',
-    name: 'AdminOrder',
-    component: () => import(/* webpackChunkName: 'AdminOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
-  },{
-    path: 'orders/:order',
-    name: 'AdminOrderEdit',
-    component: () => import(/* webpackChunkName: 'AdminOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    children: [{
+      path: '',
+      name: 'Backoffice Orders',
+      meta: {
+        title: {
+          en: 'Backoffice Orders',
+          ru: 'Управление Заказами'
+        },
+        authorize: []
+      },
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/Orders.vue'),
+    },{
+      path: 'add',
+      name: 'AdminOrderAdd',
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    },{
+      path: ':order',
+      name: 'AdminOrderEdit',
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    }]
   },{
     path: 'payments',
     name: 'Backoffice Payments',

package/src/modules/community/components/pages/Community.vue

@@ -25,8 +25,14 @@
 </template>
 <script setup>
 import { ref, onMounted, computed,reactive } from 'vue'
+
+import Field from "@pf/src/components/Field/Field.vue";
+import Select from "@pf/src/components/Select/Select.vue";
+import Button from "@pf/src/components/Button/Button.vue";
+import Upload from "@pf/src/components/Upload/Upload.vue";
+
 import CardBlogpost  from '@pf/src/modules/community/components/blocks/CardBlogpost.vue'
-import { Button, Field, Select, Upload } from '@ozdao/prometheus-framework'
+
 import { 
   state as blogState, 
   read as fetchBlogPosts, 

package/src/modules/events/components/elements/ButtonCheck.vue

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <Button :submit="openPublicationPopup" class="bg-main button-small radius-extra button">
+      Check ticket
+    </Button>
+
+    <Popup title="Добавить участника" @close-popup="closePublicationPopup" :isPopupOpen="isPublicationPopup"
+      class="w-max-30r h-max-30r t-left pd-big bg-white radius-big">
+      <h3 class="mn-b-small">Final Touches</h3>
+
+      <div style="border: 2px solid black" class="h-100">
+        <QrcodeStream :track="paintBoundingBox" @detect="onDetect" @error="onError"></QrcodeStream>
+      </div>
+    </Popup>
+  </div>
+</template>
+
+<script setup>
+// Deps
+import { ref } from 'vue'
+import { QrcodeStream } from 'vue-qrcode-reader'
+
+// In components
+import Popup from '@pf/src/components/Popup/Popup.vue'
+import Button from '@pf/src/components/Button/Button.vue'
+
+// Methods 
+import * as tickets from '@pf/src/modules/events/store/tickets'
+
+const isPublicationPopup = ref(false)
+
+function openPublicationPopup() {
+  isPublicationPopup.value = true
+}
+
+function closePublicationPopup() {
+  isPublicationPopup.value = false
+}
+
+const result = ref(null)
+async function onDetect(detectedCodes) {
+  result.value = detectedCodes.map((code) => code.rawValue)
+  
+  try {
+    const qrcode = result.value[0] || ''
+    console.log('Получено значение qrcode:', qrcode);
+
+    if (!qrcode) {
+      throw new Error('неудалось прочитать qrcode');
+    }
+
+    const response = await tickets.actions.update({
+      _id: qrcode,
+      status: 'used',
+    })
+
+    console.log('Обновлено значение ticket.status:', response)
+
+    alert('Билет проверен');
+
+    closePublicationPopup()
+  } catch (e) {
+    alert('Билет не найден или уже использован');
+
+    console.error('Ошибка при обновлении ticket.status:', e.message)
+  }
+}
+
+function onError(err) {
+  error.value = `[${err.name}]: `
+
+  if (err.name === 'NotAllowedError') {
+    error.value += 'you need to grant camera access permission'
+  } else if (err.name === 'NotFoundError') {
+    error.value += 'no camera on this device'
+  } else if (err.name === 'NotSupportedError') {
+    error.value += 'secure context required (HTTPS, localhost)'
+  } else if (err.name === 'NotReadableError') {
+    error.value += 'is the camera already in use?'
+  } else if (err.name === 'OverconstrainedError') {
+    error.value += 'installed cameras are not suitable'
+  } else if (err.name === 'StreamApiNotSupportedError') {
+    error.value += 'Stream API is not supported in this browser'
+  } else if (err.name === 'InsecureContextError') {
+    error.value += 'Camera access is only permitted in secure context. Use HTTPS or localhost rather than HTTP.'
+  } else {
+    error.value += err.message
+  }
+}
+
+function paintBoundingBox(detectedCodes, ctx) {
+  for (const detectedCode of detectedCodes) {
+    const {
+      boundingBox: { x, y, width, height }
+    } = detectedCode
+
+    ctx.lineWidth = 2
+    ctx.strokeStyle = '#007bff'
+    ctx.strokeRect(x, y, width, height)
+  }
+}
+</script>
+
+<style scoped>
+/* Existing styles can stay unchanged */
+</style>

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

@@ -128,6 +128,10 @@
           @updateTicket="handleTicketUpdate"
         />
 
+        <!-- <img v-if="qrcode" :src="qrcode" class="w-8r h-8r" /> -->
+
+        <!-- <ButtonCheck class="w-100 pd-medium mn-auto" /> -->
+
         <section>
           <component
             v-if="event && event.content"
@@ -169,13 +173,14 @@
   import HeroEvent from '@pf/src/modules/events/components/sections/HeroEvent.vue';
   import SectionMainGuest from '@pf/src/modules/events/components/sections/SectionMainGuest.vue';
   import SectionSpecialGuests from '@pf/src/modules/events/components/sections/SectionSpecialGuests.vue'
-  import SectionLineUp from '@pf/src/modules/events/components/sections/SectionLineUp.vue';
+  import SectionLineUp from '@pf/src/modules/events/components/sections/SectionLineup.vue';
   import SectionPreviousEvents from '@pf/src/modules/events/components/sections/SectionPreviousEvents.vue';
 
 
   import CardEvent from '@pf/src/modules/events/components/blocks/CardEvent.vue';
   import SkeletonEvent from '@pf/src/modules/icons/skeletons/SkeletonEvent.vue'
   import ButtonJoin from '@pf/src/modules/events/components/elements/ButtonJoin.vue';
+  // import ButtonCheck from '@pf/src/modules/events/components/elements/ButtonCheck.vue'
   import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
 
   import Image  from '@pf/src/modules/constructor/components/elements/Image.vue';
@@ -187,9 +192,13 @@
   import { useRoute } from 'vue-router';
 
   const route = useRoute();
+  const qrcode = ref(null);
   
   const handleTicketUpdate = ({ ticket, hasTicket, targetId }) => {
     tickets.mutations.handleTicketUpdate(event.value, ticket, hasTicket, targetId);
+    console.log('HANDLE TICKET UPDATE', ticket, event.value);
+
+    qrcode.value = ticket.qrcode;
   };
 
 

package/src/modules/events/components/sections/SectionMainGuest.vue

@@ -55,7 +55,7 @@
 
 	import { ref, onMounted } from 'vue';
 
-	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'	
+	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
 
 	const props = defineProps({
 		content: {

package/src/modules/events/components/sections/SectionSpecialGuests.vue

@@ -32,7 +32,7 @@
 <script setup>
 	import { useI18n } from 'vue-i18n'
 
-	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'
+	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
 
 	const props = defineProps({
 		content: {

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

@@ -1,3 +1,5 @@
+const QRCode = require("qrcode");
+
 const controllerFactory = (db) => {
   const Ticket = db.ticket;
 
@@ -42,6 +44,17 @@ const controllerFactory = (db) => {
 
     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" });
@@ -50,12 +63,28 @@ const controllerFactory = (db) => {
 
   const update = async (req, res) => {
     try {
-      const ticket = await Ticket.findByIdAndUpdate(req.body._id, req.body, { new: true });
+      const { _id } = req.body;
+  
+      // Поиск билета по ID
+      const ticket = await Ticket.findById(_id);
+  
+      // Если билет не найден
       if (!ticket) {
         return res.status(404).send({ errorCode: "TICKET_NOT_FOUND" });
       }
-      res.send(ticket);
+  
+      // Проверка статуса билета
+      if (ticket.status === "used") {
+        return res.status(500).send({ errorCode: "TICKET_ALREADY_USED" });
+      }
+  
+      // Обновление билета
+      const updatedTicket = await Ticket.findByIdAndUpdate(_id, req.body, { new: true });
+  
+      // Отправка обновленного билета
+      res.send(updatedTicket);
     } catch (err) {
+      // Обработка ошибки сервера
       res.status(500).send({ errorCode: "SERVER_ERROR" });
     }
   };

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

@@ -23,6 +23,14 @@ module.exports = (mongoose) => {
       type: String,
       default: 'participant'
     },
+    qrcode: {
+      type: String,
+    },
+    status: {
+      type: String,
+      enum: ["unused", "used"],
+      deafult: "unused",
+    },
   });
 
   TicketSchema.index({ user: 1, type: 1, target: 1 });

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

@@ -103,6 +103,7 @@ async function read(options = {}) {
     console.log('Request params:' + options.params)
     const response = await $axios.get('/api/events/read', { params: options.params });
     console.log(options.params)
+    
     if (options.url) {
       set(response.data, 'current')
     } else {

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" 
 

package/src/modules/globals/models/ownership.schema.js

@@ -14,7 +14,7 @@ module.exports = function applyOwnershipSchema(schema,db) {
     creator: {
       hidden: {
         type: Boolean,
-        required: true
+        default: false
       },
       type: {
         type: String,

package/src/modules/landing/components/pages/Home.vue

@@ -37,9 +37,8 @@
 	// Not working
 	import JoinUs 		from '@pf/src/modules/community/components/sections/JoinUs.vue'
 	import SubscribeNewsletter 		from '@pf/src/modules/applications/components/sections/SubscribeNewsletter.vue'
-	import HeroSection 			from '@pf/src/modules/landing/components/sections/HeroSection.vue'
-	import AboutSection 			from '@pf/src/modules/landing/components/sections/AboutSection.vue'
-	import HowItWorksSection  			from '@pf/src/modules/landing/components/sections/HowItWorksSection.vue'
+	// import HeroSection 			from '@pf/src/modules/landing/components/sections/HeroSection.vue'
+	// import HowItWorksSection  			from '@pf/src/modules/landing/components/sections/HowItWorksSection.vue'
 	import MapSection 			from '@pf/src/modules/landing/components/sections/MapSection.vue'
 
  	import Footer from '@pf/src/components/Footer/Footer.vue'

package/src/modules/orders/components/pages/EditOrder.vue

@@ -1,8 +1,17 @@
 <template>
   <div>
-    <header class="mn-b-medium flex-v-center flex-nowrap flex">
-      <h2 class="mn-r-medium">Create Order</h2>
-    </header>
+    <Block class="mn-b-thin">
+      <header class="flex-v-center flex-nowrap flex">
+        <h2 class="mn-r-auto">Create Order</h2>
+        <Button 
+          :submit="onSubmit"
+          :callback="redirectTo"
+          class="pd-small radius-big bg-main t-black uppercase t-medium"
+        >
+          Add Order 
+        </Button>
+      </header>
+    </Block>
 
     <Popup 
       title="Добавить участника" 
@@ -51,7 +60,7 @@
     </Popup>
 
     <Block
-      title="Invetory Sheet"
+      title="Positions"
       :actions="[{
         label: '+',
         function: () => openProductsPopup()
@@ -76,28 +85,40 @@
         class="mn-b-thin pd-thin radius-medium bg-white"
       /> 
     </Block>
-  <!-- 
-    <FormOrderDetails 	
-  		:order="orders.state.current"  
-  		@create="handleCreate"
-  		class="bg-grey pd-medium radius-big mn-b-semi"
-  	/> -->
-
-
-  <div class="mn-thinw-100 flex-v-center flex block">
-  	<p class="p-big">Сумма к оплате:
-  		<span v-if="order?.info?.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
-  		<span v-if="order?.info?.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
-  		<span v-if="order?.info?.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
-  		(Заказ {{orderTotalPrice / 100}} ₽ + доставка
-  		<span v-if="order?.info?.delivery === 'Самовывоз'" >0</span>
-  		<span v-if="order?.info?.delivery === 'Курьером'" >350</span>
-  		<span v-if="order?.info?.delivery === 'Почтой'">550</span>
-  	    ₽)  
-  	</p>
-
-  	<button class="mn-l-auto button">Запросить онлайн</button>
-  </div>
+
+    <Block
+      title="Client"
+      class="mn-b-semi"
+    >
+      <Field 
+        v-model:field="orders.state.current.client.name"     
+        label="Client"    
+        placeholder="Enter client name"  
+        class="bg-white pd-medium radius-small mn-b-thin"
+      />
+
+      <Field 
+        v-model:field="orders.state.current.comment"     
+        label="Comment"    
+        placeholder="Enter comment"  
+        class="bg-white pd-medium radius-small mn-b-thin"
+      />
+      
+     <!--  <FormClientDetails
+        :order="orders.state.current"  
+        class="bg-white"
+      /> -->
+
+    </Block>
+
+    <Block
+      class="mn-b-semi"
+    >
+      <div class="h3 flex">
+        <span class="mn-r-auto t-transp">In total</span>
+        <span>{{ cartTotalPrice }} {{returnCurrency()}} </span  >
+      </div>
+    </Block>
 </div>
 
 
@@ -106,24 +127,34 @@
 <script setup="props">
   // Import Vue functionality
   import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
-  import { useRoute } from 'vue-router'
+  import { useRoute,useRouter } from 'vue-router'
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import Field from '@pf/src/components/Field/Field.vue'
+  import Button from "@pf/src/components/Button/Button.vue";  
   import Popup from '@pf/src/components/Popup/Popup.vue';
 	import Block from '@pf/src/components/Block/Block.vue';
 
   import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
-
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
-  
 
+  import FormClientDetails from '@pf/src/modules/orders/components/sections/FormClientDetails.vue'
   // Import your store
+  import * as auth from '@pf/src/modules/auth/store/auth';
   import * as globals from '@pf/src/modules/globals/store/globals';
   import * as orders from '@pf/src/modules/orders/store/orders';
 	import * as products from '@pf/src/modules/products/store/products';
 
   // Accessing router
   const route = useRoute()
+  const router = useRouter()
+
+  let cartTotalPrice = computed(() => {
+    return Number(orders.state.current.positions.reduce((total, product) => {
+      return total + product.price * product.quantity;
+    }, 0));
+  })
 
   // Popup
   const isOpenProductsPopup = ref(false);
@@ -139,6 +170,30 @@
   // Data
   let order = ref(null)
 
+  function onSubmit() {
+
+    orders.state.current.creator = {
+      type: 'user',
+      target: auth.state.user._id
+    }
+
+    orders.state.current.owner = {
+      type: 'organization',
+      target: route.params._id,
+    }
+
+    orders.actions.create(orders.state.current)
+  }
+
+  function redirectTo () {
+    router.push({
+      name: 'Backoffice Orders', 
+      params: { 
+        _id: route.params._id
+      } 
+    })
+  }
+
   onMounted(async () => {
     // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 

package/src/modules/orders/components/pages/FormOrder.vue

@@ -85,7 +85,7 @@
 			<!-- Send order -->
 		  <button 
 		  	v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
-		    :disabled="
+		   	:disabled="
 		      errorName 
 		      || errorPhoneOrMessenger 
 		      || errorCity 
@@ -148,6 +148,8 @@ const cartTotalPrice = computed(() => shopcart.getters.cartTotalPrice)
 // Organization
 const orderOrganization = ref([])
 
+import Radio from '@pf/src/components/Radio/Radio.vue'
+
 onMounted(async()=> {
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
@@ -197,7 +199,18 @@ const errorPayment = computed(() => {
 async function handleCreate() {
 
 	orders.state.current.status = 'created';
-	
+	orders.state.current.delivery.type = 'courier'
+
+	orders.state.current.owner = {
+		target: orderOrganization.value._id,
+		type: 'organization'
+	}
+
+	orders.state.current.creator = {
+		target: auth.state.user._id,
+		type: 'user'
+	}
+
   let order = await orders.actions.create(shopcart.state.positions, shopcart.state.organization);
 
   if (order) {