@ozdao/prometheus-framework 0.2.90 → 0.2.92

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

@@ -23,7 +23,7 @@
 				<div v-if="tabAuth === 'phone'" class="mn-b-semi radius-small o-hidden">
 					<p class="mn-b-small t-transp">{{ t('smsInfo') }}</p>
 					<FieldPhone
-						v-model:modelValue="auth.state.user.phone" 	
+						@change="(event) => auth.state.user.phone = event" 	
 						:dropdownOptions="{
 							showDialCodeInSelection: true,
 							showFlags: true,

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

@@ -30,15 +30,16 @@
 			<transition name="slide-fade">
 				<div v-show="tabAuth === 'phone'" class="mn-b-thin radius-small">
 					<FieldPhone
-						v-model:modelValue="auth.state.user.phone" 	
+						@change="(event) => auth.state.user.phone = event" 	
 						:dropdownOptions="{
 							showDialCodeInSelection: true,
 							showFlags: true,
 							showDialCodeInList: true
 						}"
+						:validCharactersOnly="true"
 						:validation="phoneValidation" 
 						mode="national"
-						:inputOptions="{placeholder: t('phonePlaceholder')}"
+						:inputOptions="{placeholder: t('phonePlaceholder'), type: 'tel'}"
 						class="bg-grey pd-small radius-small mn-b-thin" 
 					/>
 					
@@ -165,7 +166,6 @@ async function onSubmit() {
 
 	// COSTIL PLEASE GOD MAKE IT GOOD, FUKEN INPUT COMPONENT RETURN OBJECT NUT NUMBER
 	const userCopy = {...auth.state.user};
-	userCopy.phone = auth.state.user.phone.number
 	// COSTIL PLEASE GOD MAKE IT GOOD, FUKEN INPUT COMPONENT RETURN OBJECT NUT NUMBER
 
  	await auth.actions.login(userCopy, tabAuth.value)

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

@@ -22,7 +22,7 @@
 				<div v-show="tabAuth === 'phone'" class="mn-b-semi radius-small">
 					<p class="mn-b-small t-transp">{{t('smsNotice')}}</p>
 					<FieldPhone
-						v-model:modelValue="auth.state.user.phone" 	
+						@change="(event) => auth.state.user.phone = event" 	
 						:dropdownOptions="{
 							showDialCodeInSelection: true,
 							showFlags: true,

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

@@ -44,6 +44,7 @@ const controllerFactory = (db) => {
         const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
 
         if (!passwordIsValid) {
+          console.log('req obdy is', req.body)
           return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
         }
       }

package/src/modules/auth/store/auth.js

@@ -10,7 +10,7 @@
   // State
   import * as twofa from './twofa'
   // Setup Axios
-  const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true })
+  const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });
   // State
   const state = reactive({
     user: {
@@ -104,8 +104,6 @@
       }
 
       try {
-        if (user.phone?.number) user.phone = user.phone.number
-
         const response = await $axios.post('/api/auth/signup', {
           ...user,
           type,
@@ -156,7 +154,7 @@
       try {
         const response = await $axios.post('/api/auth/reset-password', {
           email: user.email,
-          phone: user.phone.number,
+          phone: user.phone,
           type
         });
 
@@ -188,7 +186,7 @@
       try {
         const response = await $axios.post('/api/auth/update-password', {
           email: user.email,
-          phone: user.phone.number,
+          phone: user.phone,
           password: user.password,
           passwordRepeat: user.passwordRepeat,
           type

package/src/modules/auth/store/twofa.js

@@ -24,7 +24,7 @@ async function sendCode (user, method, type) {
   if (method === 'reset-password') api = '/api/twofa/sendcodereset'
 
   return await $axios.post(api, {
-    phone: user.phone.number,
+    phone: user.phone,
     email: user.email,
     method: method,
     type: type

package/src/modules/events/components/layouts/layoutEvents.vue

@@ -1,12 +1,5 @@
 <template>
-
   <div class="pd-thin h-min-100">
-    <DatePicker
-      v-model:date="events.state.filter.date"
-      :locale="$i18n.locale"
-      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
-    />
-
     <router-view v-slot="{ Component, route }">
       <transition name="scaleIn" mode="out-in">
         <component ref="page" :key="route.query" :is="Component" />
@@ -17,60 +10,10 @@
 
 <script setup="props">
   import { computed,onMounted, toRefs,ref, watch } from 'vue'
-  import { useRoute,useRouter } from 'vue-router'
-
-  import Select from '@pf/src/components/Select/Select.vue'
-  import DatePicker from '@pf/src/components/DatePicker/DatePicker.vue'
-  // Import state
-  import * as events from '@pf/src/modules/events/store/events.js';
-
-  // State
+  import { useRoute,useRouter } from 'vue-router';
+  // Router
   const route = useRoute();
   const router = useRouter()
-
-  let baseDate = new Date();
-  const formattedDate = formatDateForRouter(baseDate);
-  
-  function formatDateForRouter(date) {
-    return `${date.getDate().toString().padStart(2, '0')}${(date.getMonth() + 1).toString().padStart(2, '0')}${date.getFullYear()}`;
-  }
-
-  if (route.query) {
-    const query = route.query;
-    
-    const newFilterValue = {
-      tags: query.tags ? query.tags.split(',') : null,
-      date: query.date ? query.date : formattedDate,
-    };
-
-    events.state.filter = newFilterValue;  // <-- Modified
-  } else {
-    const newFilterValue = {
-      date: formattedDate,
-    };
-
-    events.state.filter = newFilterValue;
-  }
-
-  watch(() => events.state.filter, (newFilterValue, oldFilterValue) => {  // <-- Modified
-    const query = { ...route.query };
-
-    Object.keys(oldFilterValue).forEach(key => {
-      if (query[key]) {
-        delete query[key];
-      }
-    });
-
-    const newQueryValues = Object.fromEntries(
-      Object.entries(newFilterValue)
-        .filter(([key, value]) => (Array.isArray(value) && value.length > 0) || (typeof value === 'string' && value))
-        .map(([key, value]) => [key, Array.isArray(value) ? value.join(',') : value])
-    );
-    Object.assign(query, newQueryValues);
-
-    router.push({ query });
-  }, { deep: true })
-
 </script>
 
 <style lang="scss">

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

@@ -1,34 +1,72 @@
 <template>
   <section class="pd-thin">
+    <header 
+      class="mn-b-medium flex-v-center flex-nowrap flex"
+    >
+      <h2
+        class="mn-r-medium"
+      >
+        Featured
+      </h2>
+    </header>
     <List
       :user="auth.state.user._id"
-      class="bg-grey mn-b-thin radius-big"
-      :phase="'week'"
+      class="bg-grey mn-b-medium radius-big"
+      :phase="'planned'"
     />
     <header 
       class="mn-b-medium flex-v-center flex-nowrap flex"
     >
-          <h2
-            class="mn-r-medium"
-          >
-            Events
-          </h2>
-          
-          <button 
-            @click="router.push({name: 'Create Event'})" 
-            class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
-          >
-            +
-          </button>
+      <h2
+        class="mn-r-medium"
+      >
+        All Events
+      </h2>
+      
+      <button 
+        @click="router.push({name: 'Create Event'})" 
+        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
+      >
+        +
+      </button>
     </header>
 
-    
-    <Feed 
-      :user="auth.state.user._id"
-      :owner="route.params._id"
-      :sortOrder="'desc'"
-      :sortParam="'date.start'"
+     <DatePicker
+      v-model:date="events.state.filter.date"
+      :locale="$i18n.locale"
+      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
     />
+
+    <Feed
+      :states="{
+        empty: {
+          title: 'No Events Found',
+          description: 'Currently, there are no events available.'
+        }
+      }"
+      :store="{
+        read: (options) => events.read(options),
+        state: events.state
+      }"
+      :options="{
+          user: auth.state.user._id,
+          date: events.state.filter.date,
+          limit: 10
+      }"
+      v-slot="{ 
+        items 
+      }"
+    >
+       <CardEvent 
+        @click="$router.push({name: 'Event', params: {url: event.url}})" 
+        v-for="(event,index) in items" 
+        :key="event._id" 
+        :event="event" 
+        :user="auth.state.user._id" 
+        :type="'normal'"
+        class="bg-grey radius-big mn-b-medium"
+      />
+    </Feed>
   </section>
 </template>
 
@@ -37,16 +75,61 @@
   import { useRoute, useRouter } from 'vue-router';
 
   import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue';
-  import Feed from '@pf/src/modules/events/components/sections/Feed.vue'; 
-  import List from '@pf/src/modules/events/components/sections/List.vue'; 
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+  import DatePicker from '@pf/src/components/DatePicker/DatePicker.vue'
 
+  import List from '@pf/src/modules/events/components/sections/List.vue';   
+  import CardEvent from '@pf/src/modules/events/components/blocks/CardEvent.vue';
   // Import state
-  import * as events from '@pf/src/modules/events/store/events.js';  // <-- Modified
+  import * as events from '@pf/src/modules/events/store/events.js'; 
   import * as auth from '@pf/src/modules/auth/store/auth'
 
   // State
   const route = useRoute();
   const router = useRouter();
+
+  let baseDate = new Date();
+  const formattedDate = formatDateForRouter(baseDate);
+  
+  function formatDateForRouter(date) {
+    return `${date.getDate().toString().padStart(2, '0')}${(date.getMonth() + 1).toString().padStart(2, '0')}${date.getFullYear()}`;
+  }
+
+  if (route.query) {
+    const query = route.query;
+    
+    const newFilterValue = {
+      tags: query.tags ? query.tags.split(',') : null,
+      date: query.date ? query.date : formattedDate,
+    };
+
+    events.state.filter = newFilterValue;  // <-- Modified
+  } else {
+    const newFilterValue = {
+      date: formattedDate,
+    };
+
+    events.state.filter = newFilterValue;
+  }
+
+  watch(() => events.state.filter, (newFilterValue, oldFilterValue) => {  // <-- Modified
+    const query = { ...route.query };
+
+    Object.keys(oldFilterValue).forEach(key => {
+      if (query[key]) {
+        delete query[key];
+      }
+    });
+
+    const newQueryValues = Object.fromEntries(
+      Object.entries(newFilterValue)
+        .filter(([key, value]) => (Array.isArray(value) && value.length > 0) || (typeof value === 'string' && value))
+        .map(([key, value]) => [key, Array.isArray(value) ? value.join(',') : value])
+    );
+    Object.assign(query, newQueryValues);
+
+    router.push({ query });
+  }, { deep: true })
 </script>
 
 <style lang="scss">

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

@@ -127,10 +127,13 @@ const middlewareFactory = (db) => {
     event = req.body
 
     // Update related product and payment link
-    const { product, price, paymentLink } = await serviceStripe.updateProduct(event);
+    if (event.special) {
+      const { product, price, paymentLink } = await serviceStripe.updateProduct(event);
+
+      if (paymentLink) {
+        event.specialData.ticketLinkStripe = paymentLink.url; // Update with new payment link
+      }
 
-    if (paymentLink) {
-      event.specialData.ticketLinkStripe = paymentLink.url; // Update with new payment link
     }
 
     await Event.updateOne({ _id: event._id }, { $set: event });

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

@@ -78,7 +78,7 @@
 
 				<div class="d-block mn-l-auto flex-nowrap flex flex-v-center">
 					
-					<div v-if="members" class="w-4r i-thin">
+					<div v-if="members" class="w-4r pos-relative i-thin">
 					    <!-- Круг с числом участников -->
 					    <span 
 					        :style="{ 
@@ -103,8 +103,12 @@
 					    </span>
 
 					    <!-- Аватарки -->
-					    <img 
-					        v-for="(photo, index) in membersPhotos.slice(0,2)"
+					    <template
+								v-for="(photo, index) in membersPhotos.slice(0,2)"
+					    >
+						    <img 
+					    		v-if="photo"
+					     
 					        :key="index"
 					        :src="(FILE_SERVER_URL || '') + photo"
 					        :style="{ 
@@ -121,7 +125,28 @@
 					        	bg-grey 
 					        	radius-big
 					        "
-					    />
+						    />
+
+						    <PlaceholderUserpic
+									v-else
+									:style="{ 
+					        	position: 'absolute', 
+					        	top: '0px', 
+					        	right: (index * 20 + 20) + '%', 
+					        	zIndex: 1 - index 
+					        }"
+									class="
+					        	br-solid 
+					        	br-2px 
+					        	br-white 
+					        	i-thin 
+					        	bg-grey 
+					        	radius-big
+					        "
+								/>
+							</template> 
+
+
 					</div>
 				</div>
 

package/src/modules/landing/landing.client.js

@@ -1,6 +1,8 @@
 // Importing Vue components
 import MobileApp from './components/sections/MobileApp.vue';
+import SectionFeatures from './components/sections/SectionFeatures.vue';
 
 export {
-  MobileApp
+  MobileApp,
+  SectionFeatures
 };

package/src/modules/middlewares/client/inputs.validation.js

@@ -55,19 +55,6 @@ function validateLength(input) {
 }
 
 function validatePhone(phone) {
-  // const phoneRegex = /^.{6,}$/;
-
-  // console.log(parsePhoneNumberFromString(phone))
-  console.log(phone)
-
-  console.log(phone.valid)
-  if (!phone.valid) {
-    return {
-      status: false,
-      message:  i18n.global.t("validation.phone")
-    }
-  }
-
   return {
     status: true,
     message: null

package/src/modules/orders/components/sections/SubscribeNewsletter.vue

@@ -88,7 +88,7 @@ async function sendApplication() {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .spiral {
   background-image: url('https://weeder.delivery/spiral.jpg');
   background-size: cover;
@@ -97,7 +97,7 @@ async function sendApplication() {
   position: absolute;
   top: 50%;
   left: 50%;
-  opacity: 0.03;
+  opacity: 0.066;
   transform: translate(-50%, -50%) rotate(0deg);
   transform-origin: center center;
   animation: spin 5s linear infinite;

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

@@ -1,16 +1,15 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
+import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
 
 const orders = [
    {
     path: 'orders',
-    name: 'Backoffice Orders',
     meta: {
       title: {
         en: 'Backoffice Orders',
         ru: 'Управление Заказами'
       },
-      authorize: []
     },
+    component: layoutEmpty,
     children: [{
       path: '',
       name: 'Backoffice Orders',
@@ -19,7 +18,6 @@ const orders = [
           en: 'Backoffice Orders',
           ru: 'Управление Заказами'
         },
-        authorize: []
       },
       component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/Orders.vue'),
     },{

package/src/modules/products/components/blocks/CardProduct.vue

@@ -14,25 +14,26 @@
 		"
 	>
 
-		<router-link 
-        :to="{
-          name: 'ProductEdit', 
-          params: {
-            _id: $route.params.organization,
-            product: product._id
-          }
-        }" 
-        class="
-        	z-index-2
-          cursor-pointer 
-          pos-absolute pos-t-regular pos-r-regular
-          radius-extra pd-thin bg-second
-        "
-      >
-        <IconEdit
-          class="i-regular"
-          classes="fill-white"
-        />
+		<router-link
+			v-if="user" 
+      :to="{
+        name: 'ProductEdit', 
+        params: {
+          _id: $route.params.organization,
+          product: product._id
+        }
+      }" 
+      class="
+      	z-index-2
+        cursor-pointer 
+        pos-absolute pos-t-regular pos-r-regular
+        radius-extra pd-thin bg-second
+      "
+    >
+      <IconEdit
+        class="i-regular"
+        classes="fill-white"
+      />
       </router-link>
 
 		<!-- Product Image Sqaure -->
@@ -121,7 +122,17 @@
 
 	import PlaceholderImage from '@pf/src/modules/icons/placeholders/PlaceholderImage.vue'
 
-	const props = defineProps(['product'])
+	const props = defineProps({
+		product: {
+			type: Object
+		},
+		user: {
+			type: [Object, String] 
+		},
+		type: {
+			type: Object
+		}
+	})
 
   const { t } = useI18n()
 </script>

package/src/modules/products/components/sections/HeroRecommendation.vue

@@ -161,7 +161,7 @@
   position: absolute;
   top: 50%;
   left: 50%;
-  opacity: 0.03;
+  opacity: 0.066;
   transform: translate(-50%, -50%) rotate(0deg);
   transform-origin: center center;
   animation: spin 5s linear infinite;