@ozdao/prometheus-framework 0.2.81 → 0.2.83

package/src/components/LocationMarker/LocationMarker.vue

@@ -5,9 +5,6 @@
     <button class="cursor-pointer flex-center flex pos-absolute pos-t-regular pos-r-regular i-semi bg-second pd-nano radius-extra" @click="setUserLocation">
 
       <transition name="ScaleOut" mode="out-in"> 
-        
-
-        
         <svg v-if="!locationLoading" class="i-regular" width="98" height="98" viewBox="0 0 98 98" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M50.0004 31.4995C39.7996 31.4995 31.5 39.7991 31.5 49.9999C31.5 60.2007 39.7996 68.5003 50.0004 68.5003C60.2012 68.5003 68.5008 60.2007 68.5008 49.9999C68.5008 39.7991 60.2012 31.4995 50.0004 31.4995ZM50.0004 63.7944C42.3941 63.7944 36.2059 57.6062 36.2059 49.9999C36.2059 42.3936 42.3941 36.2054 50.0004 36.2054C57.6067 36.2054 63.7949 42.3936 63.7949 49.9999C63.7949 57.6062 57.6067 63.7944 50.0004 63.7944Z" fill="rgb(var(--white))"/>
           <path d="M97.6471 47.6471H84.56C83.3977 30.4141 69.5859 16.6024 52.3529 15.44V2.35294C52.3529 1.05255 51.2988 0 50 0C48.6996 0 47.6471 1.05255 47.6471 2.35294V15.44C30.4141 16.6024 16.6024 30.4141 15.44 47.6471H2.35294C1.05255 47.6471 0 48.6996 0 50C0 51.2988 1.05255 52.3529 2.35294 52.3529H15.44C16.6024 69.5859 30.4141 83.3977 47.6471 84.56V97.6471C47.6471 98.9459 48.6996 100 50 100C51.2988 100 52.3529 98.9459 52.3529 97.6471V84.56C69.5859 83.3977 83.3977 69.5859 84.56 52.3529H97.6471C98.9459 52.3529 100 51.2988 100 50C100 48.6996 98.9459 47.6471 97.6471 47.6471ZM50 79.9435C33.4886 79.9435 20.0565 66.5114 20.0565 50C20.0565 33.4886 33.4886 20.0565 50 20.0565C66.5098 20.0565 79.9435 33.4886 79.9435 50C79.9435 66.5098 66.5098 79.9435 50 79.9435Z" fill="rgb(var(--white))"/>      
@@ -22,6 +19,7 @@
 
 <script setup>
 import { ref, onMounted, watchEffect } from 'vue';
+import { Loader as GMLoader } from "@googlemaps/js-api-loader";
 
 import Loader from '@pf/src/components/Loader/Loader.vue'
 
@@ -46,28 +44,36 @@ const locationLoading = ref(false);
 let map, marker;
 
 onMounted(() => {
-  console.log(props.location)
-  
-  map = new google.maps.Map(mapContainer.value, {
-    center: props.location,
-    zoom: 15,
-    mapTypeControl: false,
-    fullscreenControl: false,
-    disableDefaultUI: true
+  const loader = new GMLoader({
+    apiKey: props.apiKey,
+    version: "weekly",
+    libraries: ["places"]
   });
 
-  marker = new google.maps.Marker({
-    position: props.location,
-    map,
-    draggable: true,
-  });
+  loader.load().then(() => {
+    map = new google.maps.Map(mapContainer.value, {
+      center: props.location,
+      zoom: 15,
+      mapTypeControl: false,
+      fullscreenControl: false,
+      disableDefaultUI: true
+    });
 
-  marker.addListener("dragend", (e) => {
-    const newLocation = { lat: e.latLng.lat(), lng: e.latLng.lng() };
+    marker = new google.maps.Marker({
+      position: props.location,
+      map,
+      draggable: true,
+    });
 
-    emit('update:location', newLocation);
+    marker.addListener("dragend", (e) => {
+      const newLocation = { lat: e.latLng.lat(), lng: e.latLng.lng() };
 
-    getAddressFromLocation(newLocation);
+      emit('update:location', newLocation);
+
+      getAddressFromLocation(newLocation);
+    });
+  }).catch(e => {
+    console.error(e);
   });
 });
 
@@ -139,8 +145,6 @@ async function setUserLocation() {
     console.error('Geolocation is not supported by this browser.');
     locationLoading.value = false
   }
-
-  
 }
 </script>
 

package/src/components/Popup/Popup.vue

@@ -1,28 +1,26 @@
 <template>
-	
-	<teleport to="body" v-if="isPopupOpen">
-		<transition name="TransitionTranslateY" appear>
-			
-			<div v-if="isPopupOpen" key="popup-content" class="pd-small popup-wrapper">
-
-				<transition name="TransitionTranslateY" mode="out-in">
-					<section v-if="isPopupOpen" class="pos-relative z-index-4" v-bind="$attrs">
-							<IconCross @click="closePopup()" class="cursor-pointer pos-absolute pos-t-0 pos-r-0 mn-t-semi mn-r-semi hover-scale-1 i-regular z-index-5"/>
-
-						<slot></slot>
-					</section>  
-				</transition>
-
-				<div 
-					@click="closePopup()" 
-			    :class="{'active':isPopupOpen === true}" 
-			    class="color-overlay z-index-3">
-				</div>
-
-			</div>
 
+		<transition name="TransitionTranslateY" appear>
+				<teleport to="body" v-if="isPopupOpen">
+					<div v-if="isPopupOpen" key="popup-content" class="pd-small popup-wrapper">
+
+						<transition name="TransitionTranslateY" mode="out-in">
+							<section class="pos-relative z-index-4" v-bind="$attrs" :class="$attrs.class">
+									<h4 class="mn-b-small">{{title}}</h4>
+									<IconCross @click="closePopup()" class="cursor-pointer pos-absolute pos-t-0 pos-r-0 mn-t-semi mn-r-semi hover-scale-1 i-regular z-index-5"/>
+									<slot></slot>
+							</section>  
+						</transition>
+
+						<div 
+							@click="closePopup()" 
+					    :class="{'active':isPopupOpen === true}" 
+					    class="color-overlay z-index-3">
+						</div>
+
+					</div>
+			</teleport>
 		</transition>
-	</teleport>
 
 </template>
 
@@ -39,7 +37,8 @@ const props = defineProps({
   	type: Boolean,
 	  default: false
   },
-  style: String
+  style: String,
+  title: String,
 });
 const emits = defineEmits(['close-popup'])
 

package/src/components/Select/Select.vue

@@ -15,7 +15,7 @@
     <li class="w-100">
       <!-- Selected Value -->
       <span>
-        {{ selectedOption?.name ? selectedOption?.name : selectedOption || placeholder }}
+        {{ optionsSelected?.name ? optionsSelected?.name : optionsSelected || placeholder }}
       </span>
     </li>
 
@@ -47,73 +47,84 @@
 <script setup>
 import { ref, computed, watch } from 'vue'
 
-const emit = defineEmits(['update:select', 'focus', 'blur'])
-
 import clickOutside from '../FieldPhone/click-outside';
 
 let vClickOutside = clickOutside
 
+const emit = defineEmits([
+  'update:select', 
+  'focus', 
+  'blur'
+])
 
 const props = defineProps({
   label: String,
+  placeholder: { type: String, default: 'Please select an item' },
   select: [String, Object],
   property: String,
-  placeholder: { type: String, default: 'Please select an item' },
   options: { type: Array, default: () => [] },
   validation: Boolean,
 })
 
-const selectedOption = ref(props.property ? findObjectByValue(props.select, props.property, props.options) : props.select)
 const showMenu = ref(false)
 
-function clickedOutside () {
-  showMenu.value = false
-}
-
-
-function findObjectByValue(value, property,objects) {
-  for (const object of objects) {
-    if (object[property] === value || object === value) {
-      return object;
-    }
+const optionsSelected = ref(
+  props.property 
+  ? findObjectByValue(props.select, props.property, props.options) 
+  : props.select
+)
 
-  }
-  return null;
-}
+const optionsListed = computed(() => {
+  return props.select 
+  ? props.options.filter(option => option !== props.select) 
+  : props.options
+})
 
 watch(() => props.select, (newSelect) => {
-  selectedOption.value = props.property ? findObjectByValue(props.select, props.property, props.options) : props.select;
+  optionsSelected.value = 
+  props.property 
+  ? findObjectByValue(props.select, props.property, props.options) 
+  : props.select;
 });
 
-const optionsListed = computed(() => {
-  return props.select ? props.options.filter(option => option !== props.select) : props.options
-})
-
 const toggleMenu = () => {
   showMenu.value = !showMenu.value
 
   emit(showMenu.value ? 'focus' : 'blur')
 }
 
+function clickedOutside () {
+  showMenu.value = false
+}
+
 const selectOption = option => {
-  selectedOption.value = option
+  optionsSelected.value = option
   
   toggleMenu()
 
   if (props.property) {  
-    emit('update:select', selectedOption.value[props.property])
+    emit('update:select', optionsSelected.value[props.property])
   } else {
-    emit('update:select', selectedOption.value)
+    emit('update:select', optionsSelected.value)
+  }
+}
+
+function findObjectByValue (value, property, objects) {
+  for (const object of objects) {
+    if (object[property] === value || object === value) {
+      return object;
+    }
   }
+  return null;
 }
 </script>
 
 <style lang="scss" scoped>
-li {
-  list-style-type: none;
-}
+  li {
+    list-style-type: none;
+  }
 
-ul li {
-  line-height: 2;
-}
+  ul li {
+    line-height: 2;
+  }
 </style>

package/src/components/Slider/Slider.vue

@@ -32,7 +32,8 @@ import Loader from '@pf/src/components/Loader/Loader.vue'
 const props = defineProps({
   store: Object,
   options: Object,
-  text: Object
+  text: Object,
+  user: Object
 });
 
 const router = useRouter()
@@ -63,9 +64,7 @@ const onSelect = (embla) => selectedIndex.value = emblaApi.value.selectedScrollS
 // const onInit = (embla) =>  scrollSnaps.value = emblaApi.value.scrollSnapList();
 
 onMounted(async() => {
-  entitiesState.value = await props.store.read({
-    ...props.options
-  });
+  entitiesState.value = await props.store.read(props.options);
 
   isLoading.value = false;
 

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

@@ -1,25 +1,25 @@
 <template>
 	<section class="t-left pd-medium">
 		<!-- Header -->
-		<h3 class="mn-b-small">Вы были пригилашены в организацию</h3>
-		<p class="mn-b-semi t-transp">Пожалуйста, укажите пароль, на этом регистрация будет закочена.</p>
-	
+		<h3 class="mn-b-small">You have been invited to the organization</h3>
+		<p class="mn-b-semi t-transp">Please provide a password to complete the registration.</p>
+		
 		<!-- Form -->
 		<div  class="mn-b-semi radius-small o-hidden">
 			<Field 
 				v-model:field="auth.state.user.password"
 				type="password" 	
 				:validation="passswordValidation" 
-				label="Пароль"		
+				label="Password"		
 				placeholder="******" 
-				class="bg-white radius-small mn-b-small"
+				class="mn-b-thin bg-grey pd-medium radius-small" 
 			/>
 			<Field 
 				v-model:field="auth.state.user.passwordRepeat"
 				type="password" 	
-				label="Повторите пароль"		
+				label="Repeat Password"		
 				placeholder="******" 
-				class="bg-white radius-small mn-b-semi"
+				class="bg-grey pd-medium radius-small" 
 				
 			/>
 		</div>

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

@@ -217,7 +217,7 @@
 
   // Cookies
   const optionsDefault = {
-    development: { secure: false, expires: 7 },
+    development: { secure: false, expires: 7, sameSite: 'Lax'  },
     production: { expires: 7, path: '/', domain: process.env.API_URL, sameSite: 'none', secure: true }
   };
 

package/src/modules/backoffice/components/pages/Dashboard.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="">
-		<h1>Welcome to Backoffice</h1>
+		<h1 class="pd-medium radius-medium bg-grey mn-b-small">Welcome to Backoffice</h1>
 		
 		<Menu 
 			class="bg-grey mn-b-semi"
@@ -12,117 +12,124 @@
 		  			_id: route.params._id
 		  		}
 		  	})" 
-		  	class="cursor-pointer">
+		  	class="cursor-pointer"
+		  >
+		  	<IconGroups class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
 		    	Members
 		    </span>
 		  </MenuItem>
 
-		  <MenuItem 
+		  <!-- <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Events', 
+		  		name: 'Backoffice Community', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
-		    	Events
+		    	Community
 		    </span>
-		  </MenuItem>
+		  </MenuItem> -->
 
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Community', 
+		  		name: 'Products', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
+		  	<IconProducts class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Community
+		    	Products
 		    </span>
 		  </MenuItem>
 
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Products', 
+		  		name: 'Leftovers', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
+		  	<IconLeftovers class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Products
+		    	Leftovers
 		    </span>
 		  </MenuItem>
 
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Leftovers', 
+		  		name: 'Backoffice Orders', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
+		  	<IconOrders class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Leftovers
+		    	Orders
 		    </span>
 		  </MenuItem>
 
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Orders', 
+		  		name: 'Backoffice Gallery', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
+		  	<IconGallery class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Orders
+		    	Gallery
 		    </span>
 		  </MenuItem>
-
+		  
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Payments', 
+		  		name: 'Backoffice Events', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
+		  	<IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Payments
+		    	Events
 		    </span>
 		  </MenuItem>
-		</Menu>
 
-		<Menu 
-			class="bg-grey"
-		>
-			<MenuItem 
+		 <!--  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Organizations', 
+		  		name: 'Payments', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
-		    	Organizations
+		    	Payments
 		    </span>
-		  </MenuItem>
+		  </MenuItem> -->
+		</Menu>
 
-		  <MenuItem 
+		<!-- <Menu 
+			class="bg-grey"
+		>
+			<MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Gallery', 
+		  		name: 'Backoffice Organizations', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
-		    	Gallery
+		    	Organizations
 		    </span>
 		  </MenuItem>
 
@@ -138,7 +145,7 @@
 		    	Reports
 		    </span>
 		  </MenuItem>
-		</Menu>
+		</Menu> -->
 	</div>
 </template>
 
@@ -152,6 +159,14 @@ import { ref, onMounted } from 'vue';
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
+
+import IconProducts from '@pf/src/modules/icons/entities/IconProducts.vue'
+import IconEvents from '@pf/src/modules/icons/entities/IconEvents.vue'
+import IconGroups from '@pf/src/modules/icons/entities/IconGroups.vue'
+import IconCommunity from '@pf/src/modules/icons/entities/IconCommunity.vue'
+import IconGallery from '@pf/src/modules/icons/entities/IconGallery.vue'
+import IconOrders from '@pf/src/modules/icons/entities/IconOrders.vue'
+import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
 /////////////////////////////
 // HELPERS
 /////////////////////////////

package/src/modules/chats/components/blocks/ChatMessage.vue

@@ -4,7 +4,7 @@
     :class="{'bg-main-nano': message.username === 'Weeder Support'}"
   >
     <p class="flex-v-center gap-thin flex-nowrap flex w-100 p-small">
-      <img v-if="message.username === 'Weeder Support'" src="/logo/logo.png" class="i-medium">
+      <!-- <img v-if="message.username === 'Weeder Support'" src="/logo/logo.png" class="i-medium"> -->
       <strong class="mn-r-auto"><span class="t-semi">{{ message.username }}</span> <span class="t-transp">{{formatDate(message.createdAt)}}</span></strong>
     </p>
     <p>{{ message.text }}</p>

package/src/modules/community/components/sections/HotPosts.vue

@@ -39,7 +39,7 @@
         <CardBlogpost 
           :key="item._id" 
           :blogpost="item" 
-          :user="user" 
+          :user="auth.state.user._id" 
           :hideDescription="true"
           class="bg-white flex flex-column h-35r"
         />

package/src/modules/events/components/blocks/CardEvent.vue

@@ -68,14 +68,15 @@
 					 >
 							
 						<span 
-				    	v-if="type !== 'short'" 
+				     
 				    	class="t-semi"
 				    >
-				    	{{ formattedDate }} |
+				    	{{ formattedDate }}
 				    </span>
 				    <span 
+				    		v-if="type !== 'short'"
 				    	class="t-semi ">
-				        {{ formattedTimeRange }}
+				        | {{ formattedTimeRange }}
 				    </span>
 					</div>
 

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

@@ -1,16 +1,33 @@
 <template>
-  <section>
-    <!-- <List
+  <section class="pd-thin">
+    <List
       :user="auth.state.user._id"
       class="bg-grey mn-b-thin radius-big"
       :phase="'week'"
-    /> -->
+    />
+    <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>
+    </header>
+
     
     <Feed 
-      :category="route.params.category" 
       :user="auth.state.user._id"
-      :period="route.query.period"
-      :selectedDate="events.state.filter.date"
+      :owner="route.params._id"
+      :sortOrder="'desc'"
+      :sortParam="'date.start'"
     />
   </section>
 </template>

package/src/modules/globals/components/sections/SectionPageTitle.vue

@@ -3,15 +3,27 @@
     <header class="br-b br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
       <h1 class="mn-r-auto">{{ title }}</h1>
 
-      <router-link
+      <template  
+        v-for="action in actions"   
         v-if="actions && actions.length > 0"
-        v-for="action in actions"
-        :key="action.to"
-        :to="action.to"
-        :class="action.class || 'radius-extra pd-thin uppercase t-medium hover-scale-1 transition-ease cursor-pointer t-white bg-second flex-center flex'"
       >
-        {{ action.label }}
-      </router-link>
+        <router-link
+          v-if="action.to"
+          :key="action.to"
+          :to="action.to"
+          :class="action.class || 'radius-extra pd-thin uppercase t-medium hover-scale-1 transition-ease cursor-pointer t-white bg-second flex-center flex'"
+        >
+          {{ action.label }}
+        </router-link>
+
+        <button
+          v-if="action.method"
+          @click="action.method"
+          :class="action.class || 'radius-extra pd-thin uppercase t-medium hover-scale-1 transition-ease cursor-pointer t-white bg-second flex-center flex'"
+        >
+          {{ action.label }}
+        </button>
+      </template>
     </header>
 
     <Tab