@ozdao/prometheus-framework 0.0.96 → 0.0.98

package/src/components/Chips/Chips.vue

@@ -1,12 +1,11 @@
 <template>
 	<div 
-      	class="flex-v-center flex-nowrap flex"
+      	class="flex-v-center gap-thin flex"
      >
 		<div 
 			v-if="chips.length"
 		  	v-for="(chip,index) in chips" 
 		  	class="pd-thin radius-small t-semi bg-main" 
-		  	:class="{'mn-r-thin': index !== chips.length - 1}"
 		>
 			{{chip.text ? chip.text : chip}}
 		</div>

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

@@ -76,7 +76,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -1,9 +1,8 @@
 <template>
 	<article 
-		class="bg-grey radius-big"
+		class="pos-relative bg-grey radius-big"
 	>
 
-
 		<IconEdit
 			v-if="user === blogpost.creator.target._id"
 			@click.stop="$router.push({

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

@@ -23,8 +23,8 @@
     	</h2>
 		</header>
 		
-		<ul class="bg-grey pd-medium radius-big mn-semi flex-nowrap flex">
-						<li  	
+		<ul class="w-max bg-grey pd-medium radius-big mn-semi flex-nowrap flex">
+			<li  	
 			:class="{'t-white bg-black': route.params.category === 'featured' }" 					
 			@click="router.push({name: 'Blog'})" 
 			class="mn-r-small t-medium  pd-small radius-small">👑 Featured</li>

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

@@ -66,7 +66,7 @@
     Object.assign(query, newQueryValues);
 
     // Обновляем маршрут с новым query
-    router.push({ query });
+    router.replace({ query });
   }, { deep: true })
 </script>
 

package/src/modules/community/router/blogposts.js

@@ -8,11 +8,19 @@ const community = [
       title: {
         en: 'Community',
         ru: 'Коммьюнити'
-      }
+      },
+      title_hide: true
     },
     children: [{
       path: ':category?',
       name: 'Blog',
+      meta: {
+        title: {
+          en: 'Community',
+          ru: 'Коммьюнити'
+        },
+        title_hide: true
+      },
       component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue')
     }]
   },{

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

@@ -3,6 +3,7 @@
 	  :class="{
 	  	'flex-nowrap flex-v-center flex': type === 'short'
 	  }"
+	  class="pos-relative"
   >
     <CardHeader 
 	    :class="{
@@ -21,7 +22,7 @@
 
  		<div 
  			v-if="event.cover && type !== 'short'" 
- 			class="o-hidden bg-grey mn-small w-100"
+ 			class="o-hidden pos-relative bg-grey mn-small w-100"
  		>
 	    <img 
 	    	:src="(FILE_SERVER_URL || '') + event.cover" 
@@ -41,7 +42,7 @@
 	  </div>
 
     <section 
-    	class="w-100"
+    	class="pos-relative w-100"
     	:class="{'pd-t-zero pd-medium': type !== 'short'}"
     >
 
@@ -196,6 +197,9 @@
 
 	// Computed property for time range
 	const formattedTimeRange = computed(() => {
+
+		console.log(props.event.date.start)
+		console.log(props.event.date.end)
     const start = new Date(props.event.date.start);
     const end = new Date(props.event.date.end);
 

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

@@ -22,22 +22,8 @@
     />
 
 		<h3 class="mn-small">Date</h3>
-    {{event.date.start}}
-    <Field 
-      v-model:field="event.date.start" 
-      label="Start"
-      type="datetime-local"  
-      placeholder="Not specified" 
-      class="mn-thin w-100 bg-grey pd-medium radius-small" 
-    />
+    <VueDatePicker v-model="date" range />
 
-    <Field 
-      v-model:field="event.date.end" 
-      label="End"
-      type="datetime-local"  
-      placeholder="Not specified" 
-      class="mn-thin w-100 bg-grey pd-medium radius-small" 
-    />
 
     <h3 class="mn-small">Description</h3>
 		<section v-if="event" class="pd-b-extra w-100 bg-grey pd-big radius-big">
@@ -99,6 +85,9 @@
 import Textarea from '@pf/src/modules/constructor/components/elements/Textarea.vue';
 import Constructor from '@pf/src/modules/constructor/components/sections/Constructor.vue';
 
+import VueDatePicker from '@vuepic/vue-datepicker';
+import '@vuepic/vue-datepicker/dist/main.css'
+
 import Popup from '@pf/src/components/Popup/Popup.vue';
 import Field         from '@pf/src/components/Field/Field.vue'
 import BlockTags from '@pf/src/components/FieldTags/BlockTags.vue';
@@ -123,18 +112,28 @@ let publics = ref(null);
 const selectedTags = ref([]);
 const selectedOrganization = ref(null);
 
+
+const date = ref();
+
+
 onMounted(async () =>{
   
   if (route.params.url) {
     const data = await events.read({ user: auth.state.user._id, url: route.params.url });
     event.value = data.pop();
 
-    event.value.date.start = event.value.date.start.slice(0, 16);
-    event.value.date.end = event.value.date.end.slice(0, 16);
+    const startDate = event.value.date.start;
+    const endDate = event.value.date.end;
+
+    date.value = [startDate, endDate];
 
   } else {
     events.clean();
     event.value = events.state.current;
+
+    const startDate = new Date();
+    const endDate = new Date();
+    date.value = [startDate, endDate];
   }
 
   if (!event.value.owner) event.value.owner = {
@@ -181,6 +180,11 @@ function onDrafts() {
   if (selectedTags.value.length > 0) selectedTags.value.map(tag => (tag.text))
 
   event.value.status = "draft"
+  
+  event.value.date = {
+    start: date.value.startDate,
+    end: date.value.endDate
+  }
 
   if (route.params.url) {
     events.update(event.value)
@@ -201,18 +205,6 @@ function onDrafts() {
   }
 }
 
-function onDelete() {
-  if (confirm('Are you sure you want to delete this event?')) {
-    events.delete(event.value._id)
-      .then(response => {
-        router.push({ name: 'Drafts' });
-      })
-      .catch(error => {
-        console.error(error);
-      })
-  }
-}
-
 function onSubmit() {
 
   if (selectedOrganization.value) event.value.owner = {
@@ -225,11 +217,16 @@ function onSubmit() {
 
   event.value.status = "published"
 
-  console.log(event.value)
+  event.value.date = {
+    start: date.value[0],
+    end: date.value[1]
+  }
+
+  console.log(date.value)
   if (route.params.url) {
     events.update(event.value)
       .then(response => {
-        router.push({ name: 'Blogevent', params: { url: response.url } });
+        router.push({ name: 'Event', params: { url: response.url } });
       })
       .catch(error => {
         console.log(error);
@@ -244,4 +241,25 @@ function onSubmit() {
       });
   }
 }
-</script>
+
+function onDelete() {
+  if (confirm('Are you sure you want to delete this event?')) {
+    events.delete(event.value._id)
+      .then(response => {
+        router.push({ name: 'Drafts' });
+      })
+      .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/router/events.js

@@ -8,11 +8,19 @@ const eventsRoutes = [
       title: {
         en: 'Events',
         ru: 'События'
-      }
+      },
+      title_hide: true
     },
     children: [{
       path: ':category?',
       name: 'Events',
+      meta: {
+        title: {
+          en: 'Events',
+          ru: 'События'
+        },
+        title_hide: true
+      },
       component: () => import(/* webpackChunkName: 'EventList' */ '../components/pages/Events.vue')
     }]
   },{

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

@@ -130,7 +130,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 	// Get organization _id from cookie
   	// Async requests

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

@@ -80,7 +80,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

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

@@ -82,7 +82,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

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

@@ -78,7 +78,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/users/components/pages/ProfileBlogposts.vue

@@ -63,6 +63,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileComments.vue

@@ -38,6 +38,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileEdit.vue

@@ -44,12 +44,12 @@
       v-model:field="user.profile.description"     
       label="Description"  
       placeholder="Not specified" 
-      class="mn-thin bg-grey pd-medium radius-small" 
+      class="mn-semi bg-grey pd-medium radius-small" 
       disabled="true"
       :validation="organizationName" 
     />
 
-    <p class="mn-thin">Select your birthday if you want to receive your birthday gift.</p>
+    <!-- <p class="mn-thin">Select your birthday if you want to receive your birthday gift.</p>
     
     <Field 
       v-model:field="user.birthday"     
@@ -58,7 +58,7 @@
       placeholder="Not specified" 
       class="mn-semi bg-grey pd-medium radius-small" 
       :validation="organizationName" 
-    />
+    /> -->
     <h3 class="mn-small">Socials</h3>
     <p class="mn-thin">Please provide only the username for social media profiles, without full links.</p>
 

package/src/modules/users/components/pages/ProfileEvents.vue

@@ -64,6 +64,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileLikes.vue

@@ -38,6 +38,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileOrganizations.vue

@@ -58,6 +58,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/router/users.js

@@ -34,18 +34,21 @@ const users = [{
 },{
   path: 'profile/:_id/edit',
   name: 'User Edit Profile',
-   meta: {
-      title: {
-        en: 'Edit Profile',
-        ru: 'Редактировать Профиль'
-      }
-    },
+  meta: {
+    title: {
+      en: 'Edit Profile',
+      ru: 'Редактировать Профиль'
+    }
+  },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
 },{
   path: 'profile/:_id/events',
   name: 'User Events',
   meta: {
-    title: 'Профиль',
+    title: {
+      en: 'Events',
+      ru: 'События'
+    }
   },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEvents.vue'),
 },{

package/src/styles/layout.scss

@@ -1,6 +1,5 @@
 * {
 	box-sizing: border-box;
-	position: relative;
 }
 
 *[disabled] {