@ozdao/prometheus-framework 0.2.68 → 0.2.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.68",
+  "version": "0.2.69",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/ButtonSegmented/ButtonSegmented.vue

@@ -0,0 +1,78 @@
+<template>
+	<div class="">
+		<div class="flex-nowrap flex-v-center flex pos-relative">
+
+			<div  
+				v-for="(tab,index) in tabs" 
+				:key="index" 
+				@click="selectTab(index,tab)" 
+				:class="{ 't-transp': index !== selectedTab }"
+				class="z-index-1 t-center pd-small w-100">
+				<label>{{tab.name}}</label>
+			</div>
+
+			<div 
+				:style="tabSelectorStyle" 
+				class="radius-extra bg-main t-white tab-selector">
+			</div>
+		</div>
+	</div>
+</template>
+
+
+<script setup="props">
+	import { ref, computed } from 'vue'
+
+	const emit = defineEmits(['update:selected']);
+
+	const props = defineProps({
+		tabs: Array,
+		selected: String,
+		callback: Function
+	})
+
+	const selectedTab = ref(0)
+
+	if (props.selected) {
+		const selectedIndex = props.tabs.findIndex(tab => tab.value === props.selected)
+		if (selectedIndex !== -1) {
+			selectedTab.value = selectedIndex
+		}
+	}
+	
+	function selectTab(index,tab) {
+	  selectedTab.value = index;
+	  emit('update:selected', tab.value);
+	  if (props.callback) props.callback()
+	}
+
+	function getTabSelectorLeftOffset(tabIndex) {
+	  const tabWidthPercentage = 100 / props.tabs.length;
+	  return `${tabWidthPercentage * tabIndex}%`;
+	}
+
+	function calculateTabWidth() {
+	  return `${100 / props.tabs.length}%`;
+	}
+
+	const tabSelectorStyle = computed(() => {
+	  const leftOffset = getTabSelectorLeftOffset(selectedTab.value);
+	  return { left: leftOffset, width: calculateTabWidth() };
+	});
+</script>
+
+<style lang="scss">
+	.tab-selector {
+		position: absolute;
+		width: 50%;
+		height: 100%;
+
+
+		left: 0;
+		top: 0;
+
+		z-index: 0;
+
+		transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	}
+</style>

package/src/components/Completion/Completion.vue

@@ -0,0 +1,76 @@
+<template>
+  <section class="w-100 radius-big pd-medium bg-main t-black">
+    <div class="mn-b-thin flex-v-center flex-nowrap flex">    
+      <h3>
+        {{text}}
+      </h3>
+
+      <h4 class="mn-l-thin uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin">
+        {{ percentage || completionPercentage }}%
+      </h4>
+
+      <router-link
+        v-if="cta"
+        :to="{
+          name: 'User Edit Profile',
+          params: { _id: user }
+        }"
+        class="mn-l-auto uppercase radius-big t-semi t-medium t-white bg-black w-max pd-thin"
+      >
+        {{text_cta}}
+      </router-link>
+    </div> 
+
+    <div class=" w-100 h-2r pos-relative pd-nano bg-black radius-big">
+      <div :style="`width: ${completionPercentage}%`"class="h-100 bg-main mn-b-thin radius-big">
+      </div>
+    </div>
+   
+  </section>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+
+const { user, cta, target} = defineProps({
+  user: Object,
+  target: Object,
+  cta: Boolean,
+  percentage: Number,
+  text: String,
+  text_cta: String,
+})
+
+const completionPercentage = ref(0)
+
+const calculateCompletion = (profileObject) => {
+    let totalProperties = 0;
+    let filledProperties = 0;
+
+    function recurse(obj) {
+        for (let key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                if (obj[key] && typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+                    recurse(obj[key]);  // Recurse into nested objects
+                } else {
+                    totalProperties++;
+                    if (obj[key] != null && obj[key] !== '') {
+                        filledProperties++;
+                    }
+                }
+            }
+        }
+    }
+
+    recurse(profileObject);
+
+  return (totalProperties === 0 ? 0 : Math.round((filledProperties / totalProperties) * 100));
+
+};
+
+
+if (target) completionPercentage.value = calculateCompletion(target)
+</script>
+
+<style scoped>
+</style>

package/src/components/Feed/Feed.vue

@@ -1,22 +1,27 @@
 <template>
 
-  <TransitionGroup tag="ul" name="scaleTransition" >
-    <BlockSearch 
-      v-if="search"
-      @search="updateSearch"
-      placeholder="Enter product name"
-      class="bg-white mn-b-thin"
-    />
-  </TransitionGroup>
-
-  <TransitionGroup v-if="isLoading" tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
+  <BlockSearch 
+    v-if="search"
+    :placeholder="search.placeholder || 'Search...'"
+    :class="search.class || 'bg-grey mn-b-thin'"
+    @search="updateSearch"
+  />
+
+  <TransitionGroup 
+    v-if="isLoading" 
+    tag="ul" 
+    name="scaleTransition" 
+    class="o-hidden bg-grey radius-big"
+  >
     <SkeletonEvent
       v-if="isLoading"
       v-for="i in currentLimit" :key="i"
     />
   </TransitionGroup>
 
-  <transition name="scaleTransition">
+  <transition 
+    name="scaleTransition"
+  >
     <EmptyState
       v-if="!isLoading && itemsList.length < 1"
       :title="states.empty.title"
@@ -25,19 +30,25 @@
     />
   </transition>
 
-  <TransitionGroup tag="ul" name="scaleTransition" :class="$attrs.class">
+  <TransitionGroup 
+    tag="ul" 
+    name="scaleTransition" 
+    :class="$attrs.class"
+  >
     <slot
       v-if="!isLoading && itemsList.length > 0"
       :items="itemsList"
       :user="user"
-    ></slot>
+    >
+      
+    </slot>
 
     <button
       v-if="showLoadMore && hasMoreItems && itemsList.length > 0"
       @click="loadMoreItems"
       class="col-w-100 w-100 bg-main button"
     >
-      Load more
+      Load More
     </button>
   </TransitionGroup>
 
@@ -57,14 +68,14 @@ import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.v
 
 // Пропсы
 const props = defineProps({
-  search: {
-    type: Boolean,
-    default: false
-  },
   showLoadMore: {
     type: Boolean,
     default: true
   },
+  search: {
+    type: Boolean,
+    default: false
+  },
   states: {
     type: Object,
     default: () => ({
@@ -81,6 +92,10 @@ const props = defineProps({
       state: Object,
     }),
   },
+  external: {
+    type: Boolean,
+    default: false
+  },
   options: {
     type: Object,
     default: () => ({
@@ -114,6 +129,7 @@ function updateSearch(search) {
 }
 
 const loadMoreItems = async () => {
+
   if (hasMoreItems.value) {
     currentSkip.value += currentLimit.value;
     
@@ -156,6 +172,18 @@ const fetchItems = async () => {
   isLoading.value = false;
 };
 
+watch(() => props.external, (newVal) => {
+ 
+});
+
+watch(() => props.external, (newVal, oldVal) => {
+  if (newVal !== oldVal) {
+    fetchItems();
+  }
+}, { deep: true });
+
+
+
 watch(() => props.options, (newVal, oldVal) => {
   if (
     newVal.organization !== oldVal.organization ||

package/src/components/Tab/Tab.vue

@@ -1,20 +1,15 @@
 <template>
-	<div class="">
-		<div class="flex-nowrap flex-v-center flex pos-relative">
-
-			<div  
-				v-for="(tab,index) in tabs" 
-				:key="index" 
-				@click="selectTab(index,tab)" 
-				:class="{ 't-transp': index !== selectedTab }"
-				class="z-index-1 t-center pd-small w-100">
-				<label>{{tab.name}}</label>
-			</div>
-
-			<div 
-				:style="tabSelectorStyle" 
-				class="radius-extra bg-main t-white tab-selector">
-			</div>
+	<div class="flex-nowrap flex-v-center flex pos-relative">
+		<div  
+			v-for="(tab,index) in tabs" 
+			:key="index" 
+			@click="selectTab(index,tab)" 
+			:class="{ 
+				't-transp': index !== selectedTab,
+				'br-solid br-b-3px br-main': index === selectedTab, 
+			}"
+			class="z-index-1 t-center pd-small w-max ">
+			<label>{{tab.name}}</label>
 		</div>
 	</div>
 </template>
@@ -45,20 +40,6 @@
 	  emit('update:selected', tab.value);
 	  if (props.callback) props.callback()
 	}
-
-	function getTabSelectorLeftOffset(tabIndex) {
-	  const tabWidthPercentage = 100 / props.tabs.length;
-	  return `${tabWidthPercentage * tabIndex}%`;
-	}
-
-	function calculateTabWidth() {
-	  return `${100 / props.tabs.length}%`;
-	}
-
-	const tabSelectorStyle = computed(() => {
-	  const leftOffset = getTabSelectorLeftOffset(selectedTab.value);
-	  return { left: leftOffset, width: calculateTabWidth() };
-	});
 </script>
 
 <style lang="scss">

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

@@ -27,7 +27,7 @@
 		<Button 
 			:submit="onSubmit" 
 			:callback="redirectTo" 
-			class="w-100 bg-main mn-b-big">\
+			class="w-100 bg-main mn-b-big">
 			<span>Join</span>
 		</Button>
 	</section> 

package/src/modules/auth/controllers/auth.controller.js

@@ -94,8 +94,6 @@ const controllerFactory = (db) => {
 
   const signup = async (req, res) => {
     const { type, email, phone, inviteCode } = req.body;
-
-    console.log(req.body)
     
     let userData = {
       password: bcrypt.hashSync(req.body.password, 8)
@@ -106,6 +104,7 @@ const controllerFactory = (db) => {
     } else if (type === 'phone') {
       userData.phone = phone;
     }
+
     const user = new User(userData);
 
     try {
@@ -114,24 +113,14 @@ const controllerFactory = (db) => {
       console.log(err)
       return res.status(500).send({ message: err });
     }
-    if (req.body.roles) {
-      try {
-        const roles = await Role.find({ name: { $in: req.body.roles } });
-        user.roles = roles.map(role => role._id);
-        await user.save();
-      } catch (err) {
-        console.log(err)
-        return res.status(500).send({ message: err });
-      }
-    } else {
-      try {
-        const role = await Role.findOne({ name: "user" });
-        user.roles = [role._id];
-        await user.save();
-      } catch (err) {
-        console.log(err)
-        return res.status(500).send({ message: err });
-      }
+
+    try {
+      const role = await Role.findOne({ name: "user" });
+      user.roles = [role._id];
+      await user.save();
+    } catch (err) {
+      console.log(err)
+      return res.status(500).send({ message: err });
     }
 
     let invite = null;
@@ -146,7 +135,6 @@ const controllerFactory = (db) => {
         return res.status(500).send({ message: err });
       }
     }
-    console.log(inviteCode);
 
     if (invite) {
       invite.status = 'used';
@@ -159,6 +147,7 @@ const controllerFactory = (db) => {
         target: new ObjectId(invite.organization),
         role: invite.role.name,
       });
+      
       try {
         await newMembership.save();
       } catch (err) {

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

@@ -101,11 +101,11 @@ const backofficeRoutes = [{
     },{
       path: 'add',
       name: 'AdminOrderAdd',
-      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderCreateBackoffice.vue')
     },{
       path: ':order',
       name: 'AdminOrderEdit',
-      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/OrderCreateBackoffice.vue')
     }]
   },{
     path: 'payments',
@@ -117,7 +117,7 @@ const backofficeRoutes = [{
       },
       authorize: []
     },
-    component: () => import(/* webpackChunkName: 'BackofficePayments' */ '@pf/src/modules/payments/components/pages/Payments.vue'),
+    component: () => import(/* webpackChunkName: 'BackofficePayments' */ '@pf/src/modules/wallet/components/pages/Payments.vue'),
   }
   ]
 }];

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

@@ -1,14 +1,14 @@
 <template>
   <div>
     <Button :submit="openPublicationPopup" class="bg-main button-small radius-extra button">
-      Check ticket
+      Check Tickets
     </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>
+      <h3 class="mn-b-small">Scan QR Code</h3>
 
-      <div style="border: 2px solid black" class="h-100">
+      <div class="h-max">
         <QrcodeStream :track="paintBoundingBox" @detect="onDetect" @error="onError"></QrcodeStream>
       </div>
     </Popup>
@@ -27,7 +27,10 @@ import Button from '@pf/src/components/Button/Button.vue'
 // Methods 
 import * as tickets from '@pf/src/modules/events/store/tickets'
 
+const emits = defineEmits('qrcodecheck')
+
 const isPublicationPopup = ref(false)
+const error = ref('')
 
 function openPublicationPopup() {
   isPublicationPopup.value = true
@@ -38,32 +41,29 @@ function closePublicationPopup() {
 }
 
 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');
+      throw new Error('Troubles with qrcode reading');
     }
 
     const response = await tickets.actions.update({
       _id: qrcode,
       status: 'used',
+      check: true
     })
 
-    console.log('Обновлено значение ticket.status:', response)
-
-    alert('Билет проверен');
-
-    closePublicationPopup()
+    alert("Ticket checked. And it's all right!");
   } catch (e) {
-    alert('Билет не найден или уже использован');
-
-    console.error('Ошибка при обновлении ticket.status:', e.message)
+    alert(`Ticket is not found, already used or deactivated!`);
   }
+
+  emits('qrcodecheck')
 }
 
 function onError(err) {
@@ -103,4 +103,4 @@ function paintBoundingBox(detectedCodes, ctx) {
 
 <style scoped>
 /* Existing styles can stay unchanged */
-</style>
+</style>

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

@@ -6,9 +6,10 @@
       <h2 class="mn-r-medium">Tickets</h2>
       <button 
         @click="openTicketsPopup()" 
-        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-          +
+        class="radius-extra uppercase button-small  flex-child flex-child-shrink-0 hover-scale-1 cursor-pointer t-white bg-second">
+          Add Tickets
       </button>
+      <ButtonCheck @qrcodecheck="fetchTickets = !fetchTickets " class="w-100 pd-medium mn-auto" />
     </header>
     
     <Popup 
@@ -34,13 +35,19 @@
           <Field
             v-model:field="item.name"
             placeholder="Name"
-            class="w-30 bg-white radius-small pd-medium"
+            class="w-50 bg-white radius-small pd-medium"
           />  
           <Field
             v-model:field="item.email"
             placeholder="Email"
             class="w-100 bg-white radius-small pd-medium"
           />
+          <Field
+            v-model:field="item.quantity"
+            placeholder="Quantity"
+            type="number"
+            class="w-10 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"
@@ -59,6 +66,7 @@
     </Popup>
 
     <Feed
+      :search="true"
       :states="{
         empty: {
           title: 'No Tickets Found',
@@ -72,18 +80,18 @@
       :options="{
         target: event._id
       }"
+      :external="fetchTickets"
       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"
+        class="radius-big bg-grey gap-small pd-medium flex-v-center flex-nowrap flex pos-relative mn-b-thin"
       >
+        <a :href="ticket.image" target="_blank"><img :src="ticket.qrcode" class="radius-small h-5r w-5r"></a>
 
-        <img :src="ticket.image" class="radius-small h-5r w-5r">
-
-        <div class="">
+        <div class="mn-r-auto ">
            <p class="h4">
             {{ticket.client_refactor?.name || 'No name'}}, {{ticket.role}}
            </p>
@@ -97,12 +105,22 @@
         </div>
 
         <Button 
-          :submit="onSubmit" 
+          v-if="ticket.status !== 'deactivated'"
+          :submit="() => changeStatus(ticket, 'deactivated')" 
           :callback="redirectTo" 
-          class="w-min h-min mn-l-auto bg-black t-white"
+          class="w-min h-min pd-small bg-black t-white"
         >
           Deactivate
         </Button>
+
+        <Button 
+          v-if="ticket.status === 'deactivated' || ticket.status === 'used' "
+          :submit="() => changeStatus(ticket, 'unused')" 
+          :callback="redirectTo" 
+          class="w-min h-min pd-small bg-green t-white"
+        >
+          Activate
+        </Button>
       
       </div>
     </Feed>
@@ -117,6 +135,8 @@ 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 ButtonCheck from '@pf/src/modules/events/components/elements/ButtonCheck.vue'
+
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
 
 import { ref, onMounted } from 'vue';
@@ -137,7 +157,8 @@ const newTickets = ref([{
   name: '',
   email: '',
   target: event.value?._id, 
-  type: 'event'
+  type: 'event',
+  quantity: 1,
 }])
 
 const isOpenTicketsPopup = ref(false);
@@ -149,7 +170,8 @@ function openTicketsPopup(department) {
     name: '',
     email: '',
     target: event.value?._id, 
-    type: 'event'
+    type: 'event',
+    quantity: 1,
   }]
 }
 
@@ -157,6 +179,8 @@ function closeTicketsPopup() {
   isOpenTicketsPopup.value = false;
 }
 
+const fetchTickets = ref(false)
+
 
 onMounted(async () =>{
   const data = await events.read({ user: auth.state.user._id, url: route.params.url });
@@ -167,15 +191,17 @@ onMounted(async () =>{
 async function onSubmit() {
   try {
     const response = await tickets.actions.create(newTickets.value);
+    fetchTickets.value = !fetchTickets.value
   } catch (error) {
     console.log(error);
   }
 }
 
-async function onDeactivate() {
+async function changeStatus(ticket, status) {
   if (confirm('Are you sure you want to deactivate this event?')) {
     try {
-      const response = await events.update(event.value._id);
+      const response = await tickets.actions.update({ ...ticket, status: status});
+      fetchTickets.value = !fetchTickets.value
     } catch (error) {
       console.error(error);
     }

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

@@ -130,7 +130,7 @@
 
         <!-- <img v-if="qrcode" :src="qrcode" class="w-8r h-8r" /> -->
 
-        <!-- <ButtonCheck class="w-100 pd-medium mn-auto" /> -->
+        
 
         <section>
           <component
@@ -180,7 +180,6 @@
   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';