@ozdao/prometheus-framework 0.2.221 → 0.2.222

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

@@ -1,7 +1,7 @@
 <template>
-	<div style="grid-template-columns: 2fr 4fr 2fr;" class="cols-3 gap-thin pd-thin">
+	<div style="grid-template-columns: 2fr 4fr 2fr;" class="cols-3 gap-thin pd-t-zero pd-thin">
 
-		<ul class="align-self-start pos-sticky pos-t-0 w-100 bg-light radius-big pd-medium p-medium gap-thin flex-column flex-nowrap flex">
+		<ul class="align-self-start pos-sticky pos-t-0 w-100 bg-light radius-big pd-medium p-medium gap-thin flex-column mobile:flex-row flex-nowrap flex z-index-2 o-scroll t-nowrap scroll-hide">
 			<li  	
 				:class="{'t-black bg-white': route.params.category === 'featured' }" 					
 				@click="() => { blog.state.sort.param = 'createdAt'; router.push({name: 'Blog', params: { category: 'featured' } })}" 
@@ -37,10 +37,11 @@
 			</li>
 
 			<router-link 
+				v-if="auth.state.user._id"
 				:to="{
 					name: 'Create BlogPost'
 				}" 
-				class="button t-medium mn-t-small bg-main w-100"
+				class="button t-medium bg-main w-100"
 			>
 				Create Post
 			</router-link>
@@ -48,7 +49,7 @@
 
 		<section class="pos-relative">
 
-			<header class="bg-main t-black radius-big pd-medium pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
+			<header class="bg-light t-black radius-big pd-medium pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
 	    	<h3 class="pos-relative flex-v-center flex-nowrap flex">
 	    		<span class="mn-r-thin">Topics for </span>
 
@@ -65,9 +66,6 @@
 		        	radius-medium
 		          h3
 		         	t-center
-		         	br-solid
-		         	br-2px
-		         	br-black-transp-10
 		        "
 		      />
 	    	</h3>

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

@@ -6,7 +6,6 @@
         v-for="i in 3" :key="i"
       />
     </TransitionGroup>
-
     <transition 
       name="fade"
     >
@@ -125,12 +124,10 @@
 	  return blogpost.value?.content.find(block => block.type === 'ImageUpload');
 	});
 
-	const firstVideo = computed(() => {
-	  return blogpost.value?.content.find(block => block.type === 'Video');
-	});
-
 	const firstText = computed(() => {
-	  return blogpost.value?.content[2]
+	  return blogpost.value?.content.find(block => 
+	    block.type === 'Textarea' && block.class !== 'h2'
+	  );
 	});
 
 	 const metadata = computed(() => {return {
@@ -141,12 +138,12 @@
         // { hid: 'keywords', name: 'keywords', content: t('meta.keywords') },
         { hid: 'og:title', property: 'og:title', content: blogpost.value?.name },
         { hid: 'og:description', property: 'og:description', content: firstText.value?.content.slice(0,120) },
-        // { hid: 'og:image', property: 'og:image', content: base_url + '/favicon/cover.jpg' },
+        { hid: 'og:image', property: 'og:image', content: firstImage.value?.content ? process.env.FILE_SERVER_URL + firstImage.value?.content : process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
         // { hid: 'og:url', property: 'og:url', content: current_url.value },
         { hid: 'twitter:title', name: 'twitter:title', content:  blogpost.value?.name },
-        { hid: 'twitter:description', name: 'twitter:description', content: firstText.value },
-        // { hid: 'twitter:image', name: 'twitter:image', content: base_url + '/favicon/cover.jpg' },
-        // { hid: 'twitter:card', name: 'twitter:card', content: t('meta.twitter.card') },
+        { hid: 'twitter:description', name: 'twitter:description', content: firstText.value?.content.slice(0,120) },
+        { hid: 'twitter:image', name: 'twitter:image', content: firstImage.value?.content ? process.env.FILE_SERVER_URL + firstImage.value?.content : process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
+        { hid: 'twitter:card', name: 'twitter:card', content: process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
       ],
     }});
 useHead(metadata.value)

package/src/modules/community/models/blogpost.model.js

@@ -20,7 +20,7 @@ module.exports = (db) => {
             default: Date.now 
         }
     },{
-        strict: false
+        strict: true
     });
 
     applyCommonSchema(BlogpostSchema,db);

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

@@ -1,4 +1,7 @@
 import layoutCommunity from '../components/layouts/Community.vue'
+import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
+import * as validationOwnership from '@pf/src/modules/auth/views/middlewares/ownership.validation';
+
 
 const community = [
   {
@@ -35,8 +38,10 @@ const community = [
         en: 'Create Post',
         ru: 'Создать Пост'
       },
-      authorize: []
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
     component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
   },{
     path: 'community/posts/:url',
@@ -56,8 +61,11 @@ const community = [
         en: 'Edit Post',
         ru: 'Редактировать пост'
       },
-      authorize: []
     },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      validationOwnership.requiresEditAccess
+    ],
     component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
   }
 

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

@@ -29,7 +29,6 @@ const controllerFactory = (db) => {
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
       "_id": 1
     };
-    console.log(sort)
     // if (sortParam === 'distance') sort.numberOfSpots = -1
     //////////////////////////////////////
     // 2. Pagination Condition
@@ -66,7 +65,32 @@ const controllerFactory = (db) => {
       ...(req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : []),
       ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": 'member' } ] : [] ),
       ...(req.query.subscriber ? [{"memberships.user": new ObjectId(req.query.subscriber), "memberships.role": 'subscriber'} ] : [] ),
-      ...(req.query.postable ? [{$or: [{$and: [{ types: { $elemMatch: { $eq: 'public' } } }, { "memberships.user": new ObjectId(req.query.postable) } ] }, {$and: [{types: {$elemMatch: {$in: ['exclusive', 'hidden'] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: 'subscriber' } } ] } ] } ] : [] ),
+      ...(
+        req.query.postable ? [{ 
+          $or: [{ 
+            $and: [{ 
+              types: { 
+                $elemMatch: { $eq: 'public' } 
+              } 
+            }, { 
+              "memberships.user": new ObjectId(req.query.postable) 
+            }] 
+          }, { 
+            $and: [{ 
+              types: { 
+                $elemMatch: { 
+                  $in: ['exclusive', 'hidden'] 
+                } }
+              }, { 
+                "memberships.user": new ObjectId(req.query.postable) 
+              }, { 
+                "memberships.role": { 
+                  $ne: 'subscriber' 
+                } 
+              }] 
+          }] 
+        }] : []
+      ),
       ...(req.query.types ?  [{ types: { $in: req.query.types } }] : []),  // Если req.query.types - строка
       // to remove
       ...(req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : []),
@@ -456,36 +480,4 @@ const controllerFactory = (db) => {
   };
 };
 
-async function getGeoLocation(req, res) {
-  let { location, address, city, state, country } = req.query;
-
-  if (!location && (address || city || state || country)) {
-    let geoLocation;
-
-    try {
-      const geoResponse = await client.geocode({
-        params: {
-          address: `${state}, ${country}`,
-          key: 'AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI',
-        },
-      });
-
-      if (geoResponse.data.results && geoResponse.data.results.length > 0) {
-        return geoResponse.data.results[0].geometry.location;
-      } else {
-        return res.status(400).send({ message: 'Unable to geocode the provided location.' });
-      }
-    } catch (err) {
-      console.log(err)
-      return res.status(500).send({ message: 'Error occurred while geocoding.' });
-    }
-  } else if (location) {
-    if (typeof location === 'string') {
-      location = JSON.parse(location);
-    }
-
-    return { lat: location.coordinates[1], lng: location.coordinates[0] };
-  }
-}
-
 module.exports = controllerFactory;

package/src/modules/organizations/models/department.model.js

@@ -42,6 +42,20 @@ module.exports = (mongoose) => {
           default: false,
         },
       },
+      posts: {
+        read: {
+          type: Boolean,
+          default: false,
+        },
+        edit: {
+          type: Boolean,
+          default: false,
+        },
+        delete: {
+          type: Boolean,
+          default: false,
+        },
+      },
       gallery: {
         read: {
           type: Boolean,

package/src/styles/base/all.scss

@@ -172,8 +172,6 @@ body {
 	// Flex
 	.flex {
 		display: flex;
-		&-row 						{ flex-direction: row; }
-		&-column 					{ flex-direction: column; }
 		&-nowrap 					{ flex-wrap: nowrap; } 
 		&-wrap 						{ flex-wrap: wrap; }	
 		&-center 					{ align-items: center; justify-content: center; }

package/src/styles/config.scss

@@ -283,6 +283,11 @@ $align-items: (
   'align-baseline': baseline,
 );
 
+$flex-direction: (
+  'row': row,
+  'column': column
+);
+
 body {
 	@include generate-utility-classes('pd',	'padding', $modifiers, $combined, $breakpoints);
 	@include generate-utility-classes('mn', 'margin', $modifiers, $combined, $breakpoints);
@@ -311,6 +316,7 @@ body {
 	@include generate-utility-classes('gap', 'gap', null, $combined, $breakpoints);
 	@include generate-utility-classes('flex', 'justify-content', null, $justify-content, $breakpoints);
 	@include generate-utility-classes('flex', 'align-items', null, $align-items, $breakpoints);
+	@include generate-utility-classes('flex', 'flex-direction', null, $flex-direction, $breakpoints);
 	
 	@include generate-bg-classes('bg-main', 	'main');
 	@include generate-bg-classes('bg-second',	'second');