@ozdao/martyrs 0.2.602 → 0.2.603

package/src/modules/community/community.client.js

@@ -4,7 +4,10 @@ import * as storeReactions from './store/reactions.js';
 
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
-import { getRoutes } from './community.router.js';
+import routerRoot from './router/community.router.js';
+import routerUser from './router/community.user.router.js';
+import routerOrganization from './router/community.organization.router.js';
+import routerBackoffice from './router/community.backoffice.router.js';
 
 // Views
 // Layouts
@@ -24,13 +27,57 @@ import FooterBlogpost from './components/blocks/FooterBlogpost.vue';
 import Comments from './components/sections/Comments.vue';
 import HotPosts from './components/sections/HotPosts.vue';
 
-// Пример функции инициализации для модуля сообщества
 function initializeCommunity(app, store, router, options = {}) {
-  const routes = getRoutes(options);
-  routes.forEach(({ parentName, config }) => {
-    addRoutes(router, { ...config, parentName });
+  // Root: /community/*
+  addRoutes(router, {
+    parentName: options.route || 'Home',
+    basePath: 'community',
+    component: () => import(/* webpackChunkName: "community-layout" */ './components/layouts/Community.vue'),
+    routes: routerRoot,
+    meta: {
+      context: 'root',
+      title: {
+        en: 'Community',
+        ru: 'Коммьюнити',
+      },
+      breadcrumbs: { hidden: true },
+      title_hide: true,
+    },
   });
 
+  // User: /users/:_id/blogposts/*
+  if (!options.withUserRoutes) {
+    addRoutes(router, {
+      parentName: options.routeUser || 'User Profile Root',
+      basePath: 'blogposts',
+      routes: routerUser,
+      routeNamePrefix: 'User',
+      meta: { context: 'user' },
+    });
+  }
+
+  // Organization: /organizations/:_id/posts/*
+  if (!options.withOrganizationRoutes) {
+    addRoutes(router, {
+      parentName: options.routeOrganizations || 'OrganizationRoot',
+      basePath: 'posts',
+      routes: routerOrganization,
+      routeNamePrefix: 'Organization',
+      meta: { context: 'organization' },
+    });
+  }
+
+  // Backoffice: /backoffice/community/*
+  if (!options.withBackoffice) {
+    addRoutes(router, {
+      parentName: options.routeBackoffice || 'Backoffice Root',
+      basePath: 'community',
+      routes: routerBackoffice,
+      routeNamePrefix: 'Backoffice',
+      meta: { context: 'backoffice' },
+    });
+  }
+
   store.addStore('blogposts', storeBlogposts);
   store.addStore('reactions', storeReactions);
 }
@@ -42,9 +89,7 @@ const ModuleCommunity = {
       storeBlogposts,
       storeReactions,
     },
-    router: {
-      getRoutes,
-    },
+    router: {},
     components: {
       // Layouts
       Community,
@@ -63,6 +108,6 @@ const ModuleCommunity = {
   },
 };
 
-export { Activity, Blog, BlogPost, CardBlogpost, Comments, Community, CreateBlogPost, FooterBlogpost, HotPosts, getRoutes, storeBlogposts, storeReactions };
+export { Activity, Blog, BlogPost, CardBlogpost, Comments, Community, CreateBlogPost, FooterBlogpost, HotPosts, storeBlogposts, storeReactions };
 
 export default ModuleCommunity;

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

@@ -14,7 +14,7 @@
     	:creator="blogpost.creator"
     	:date="blogpost.createdAt"
     	:actions="user && user === blogpost.creator.target._id ? [
-        { to: `/community/posts/${blogpost.url}/edit`, label: 'Edit' }
+        { to: { name: routePrefix + 'EditBlogPost', params: { _id: route.params._id, url: blogpost.url } }, label: 'Edit' }
        ]: null"
 		/>
 
@@ -30,7 +30,7 @@
 				 	:text="blogpost.name || ''" 
 				 	:maxLen="80" 
 				 	class="h3 d-block"
-				 	@click="router.push(`/community/posts/${blogpost.url}`)"
+				 	@click="router.push({ name: routePrefix + 'BlogPost', params: { _id: route.params._id, url: blogpost.url } })"
 				/>
 
 				<div 
@@ -112,10 +112,17 @@
 
 	import { computed } from 'vue'
 
-	import { useRouter } from 'vue-router'
+	import { useRoute, useRouter } from 'vue-router'
 
+	const route = useRoute()
 	const router = useRouter()
 
+	const routePrefix = computed(() => {
+		const ctx = route.meta.context
+		if (ctx === 'organization') return 'Organization'
+		return ''
+	})
+
 	const props = defineProps({
 		blogpost: {
 			type: Object,

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

@@ -3,7 +3,7 @@
 		<section class="w-100  flex-nowrap flex gap-thin mobile:pd-zero pd-thin pos-relative">
 
 			<div style="flex: 1 1 auto" class="w-100 h-100 pos-relative">
-				<header v-if="!route.params.url && route.name !== 'Create BlogPost'" class="bg-light pd-medium radius-medium mobile:radius-zero scroll-hide o-y-visible t-black pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
+				<header v-if="!route.params.url && route.name !== 'CreateBlogPost'" class="bg-light pd-medium radius-medium mobile:radius-zero scroll-hide o-y-visible t-black pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
 		    	<h2 class="pos-relative ws-nowrap flex-v-center flex-nowrap flex">
 		    		<span class="mn-r-thin">Posts for </span>
 
@@ -28,7 +28,7 @@
 		    	</h2>
 				</header>
 
-				<div  v-if="!route.params.url && route.name !=='Create BlogPost'"  class="w-100 pos-relative">
+				<div  v-if="!route.params.url && route.name !=='CreateBlogPost'"  class="w-100 pos-relative">
 					<ul class="align-self-start pos-sticky pos-t-0 w-100 bg-light radius-medium mobile:radius-zero mn-b-thin pd-medium p-regular gap-thin flex-row flex-nowrap flex z-index-2 o-scroll ws-nowrap scroll-hide">
 						<li  	
 							:class="{'t-black bg-white': route.params.category === 'featured' }" 					
@@ -67,7 +67,7 @@
 						<router-link 
 							v-if="auth.state.user._id"
 							:to="{
-								name: 'Create BlogPost'
+								name: 'CreateBlogPost'
 							}" 
 							class="button fw-medium bg-main w-max mn-l-auto"
 						>

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

@@ -25,7 +25,7 @@
 			   -->
       	<CardBlogpost 
           v-if="!isLoading && blogpost"
-          @click="$router.push({name: 'Blogpost', params: {url: blogpost.url}})" 
+          @click="$router.push({name: 'BlogPost', params: {url: blogpost.url}})" 
           :blogpost="blogpost" 
           :user="auth.state.user._id"
           :type="'blogpostPage'"

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

@@ -6,20 +6,6 @@
       style="min-height: 100%;"
       class="w-100 pd-big"
     >
-      <!-- Title -->
-      <div 
-        class="w-full h-full"
-      >
-        <!-- <Textarea 
-          v-if="post" 
-          :prop="post" 
-          :setFocus="true"
-          content="name" 
-          placeholder="Enter post title" 
-          class="h2"
-        /> -->
-      </div>
-
       <Constructor 
         v-if="post" 
         :content="post.content"
@@ -153,6 +139,12 @@ const { hasAccess } = useGlobalMixins()
 const route = useRoute();
 const router = useRouter();
 
+const routePrefix = computed(() => {
+  const ctx = route.meta.context
+  if (ctx === 'organization') return 'Organization'
+  return ''
+})
+
 let post = ref(null);
 let publics = ref(null);
 
@@ -254,7 +246,7 @@ function onDrafts() {
   if (route.params.url) {
     blog.update(post.value)
       .then(response => {
-        router.push({ name: 'BlogPost', params: { url: response.url } });
+        router.push({ name: routePrefix.value + 'BlogPost', params: { _id: route.params._id, url: response.url } });
       })
       .catch(error => {
         console.log(error);
@@ -262,7 +254,7 @@ function onDrafts() {
   } else {
     blog.create(post.value)
       .then(response => {
-        router.push({ name: 'BlogPost', params: { url: response.url } });
+        router.push({ name: routePrefix.value + 'BlogPost', params: { _id: route.params._id, url: response.url } });
       })
       .catch(error => {
         console.log(error);
@@ -287,7 +279,7 @@ function onSubmit() {
     blog.update(post.value)
       .then(response => {
         console.log(post.value)
-        router.push({ name: 'BlogPost', params: { url: response.url } });
+        router.push({ name: routePrefix.value + 'BlogPost', params: { _id: route.params._id, url: response.url } });
       })
       .catch(error => {
         console.error(error);
@@ -295,7 +287,7 @@ function onSubmit() {
   } else {
     blog.create(post.value)
       .then(response => {
-        router.push({ name: 'BlogPost', params: { url: response.url } });
+        router.push({ name: routePrefix.value + 'BlogPost', params: { _id: route.params._id, url: response.url } });
       })
       .catch(error => {
         console.error(error);
@@ -306,8 +298,15 @@ function onSubmit() {
 function onDelete() {
   if (confirm('Are you sure you want to delete this post?')) {
     blog.remove(post.value._id)
-      .then(response => {
-        router.push({ name: 'User Posts', params: { _id: post.value.creator.target._id } });
+      .then(() => {
+        const ctx = route.meta.context
+        if (ctx === 'organization') {
+          router.push({ name: 'OrganizationPosts', params: { _id: route.params._id } })
+        } else if (ctx === 'user') {
+          router.push({ name: 'UserPosts', params: { _id: route.params._id } })
+        } else {
+          router.push({ name: 'Blog' })
+        }
       })
       .catch(error => {
         console.log(error);

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

@@ -1,21 +1,23 @@
 <template>
   <div class="pos-relative">
-    <header 
-      v-if="route.name !== 'Organization' && !MOBILE_APP"
-      class="pd-medium flex-v-center flex-nowrap flex"
-    >
-      <h2 class="mn-r-medium">Posts</h2>
-      <button 
-        v-if="hasAccess(route.params._id, 'posts', 'create', auth.state.accesses, auth.state.access.roles)"
-        @click="$router.push({
-          name: route.params?._id ? 'Organization_PostAdd' : 'CreateBlogPost'
-        })" 
-        class="radius-extra i-big hover:scale-[1.05] cursor-pointer t-white bg-second">
-          +
-      </button>
-    </header>
-
-    <div class="w-100 rows-1 pd-thin pos-relative o-hidden">
+    <SectionPageTitle
+      v-if="!MOBILE_APP"
+      title="Posts"
+      :actions="hasAccess(route.params._id, 'posts', 'create', auth.state.accesses, auth.state.access.roles)
+        ? [{ method: () => $router.push({ name: routePrefix + 'CreateBlogPost', params: { _id: route.params._id } }), label: '+', class: 'radius-extra i-big hover:scale-[1.05] cursor-pointer t-white bg-second' }]
+        : []"
+      :tabs="route.meta.context === 'backoffice'
+        ? [
+            { name: 'Published', value: 'published' },
+            { name: 'Drafts', value: 'drafts' },
+          ]
+        : null"
+      :tabs_current="tab"
+      @update:tabs_current="tab = $event"
+      class="pd-medium pd-b-zero"
+    />
+
+    <div class="w-100 rows-1 pd-medium pos-relative o-hidden">
         <Feed
           :search="true"
           v-model:filter="blog.state.filter"
@@ -33,7 +35,7 @@
           }"
           :options="{
             limit: 12,
-            status: 'published',
+            status: tab === 'drafts' ? 'draft' : 'published',
             user: auth.state.user._id,
             owner: route.params._id || null,
             search: route.query.search
@@ -48,13 +50,13 @@
             :key="item._id" 
             :blogpost="item" 
             :user="auth.state.user._id" 
-            class="h-max-40r bg-light radius-medium cursor-pointer hover:scale-[1.05] ease"
-            @click="$router.push({ 
-              name: route.params._id ? 'Organization_BlogPost' : 'BlogPost', 
-              params: { 
+            class="h-max-40r bg-light radius-medium cursor-pointer"
+            @click="$router.push({
+              name: routePrefix + 'BlogPost',
+              params: {
                 _id: route.params._id,
-                url: item.url 
-              } 
+                url: item.url
+              }
             })"
           />
         </Feed>
@@ -70,6 +72,7 @@
 
   // Import components
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
+  import SectionPageTitle from '@martyrs/src/modules/core/views/components/sections/SectionPageTitle.vue'
 
   import CardBlogpost from '@martyrs/src/modules/community/components/blocks/CardBlogpost.vue'
 
@@ -81,12 +84,24 @@
   import * as blog from '@martyrs/src/modules/community/store/blogposts.js';
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
   import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
-  const core = useStore();
+  const store = useStore();
 
   const route = useRoute()
   const router = useRouter()
   const { hasAccess } = useGlobalMixins()
 
+  const routePrefix = computed(() => {
+    const ctx = route.meta.context
+    if (ctx === 'organization') return 'Organization'
+    return ''
+  })
+
+  const tab = ref(route.query.tab || 'published')
+
+  watch(tab, (newValue) => {
+    router.replace({ query: { ...route.query, tab: newValue } });
+  })
+
   // Props
   const props = defineProps({
     organization: {
@@ -96,13 +111,13 @@
   })
 
 
-  core.state.navigation_bar.actions = [{
+  store.core.state.navigation_bar.actions = [{
     component: IconPlus,
     props: {
-      fill: "rgb(var(--main))" 
+      fill: "rgb(var(--main))"
     },
     condition: () => auth.state.user && auth.state.user._id,
-    action: () => route.params._id ? router.push({ name: 'Organization_PostAdd', params: { _id: route.params._id} }) : router.push({ name: 'CreateBlogPost' })
+    action: () => router.push({ name: routePrefix.value + 'CreateBlogPost', params: { _id: route.params._id } })
   }]
 
   onMounted(async () => {
@@ -112,7 +127,7 @@
   })
 
   onUnmounted(() => {
-    core.state.navigation_bar.actions = [];
+    store.core.state.navigation_bar.actions = [];
   });
 </script>
 

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

@@ -17,7 +17,7 @@
         <button 
           v-if="totalReplies > 0" 
           @click="toggleChildren"
-          class="t-grey cursor-pointer fw-medium font-second"
+          class="t-dark cursor-pointer fw-medium font-second"
         >
           {{ isExpanded ? 'Hide' : totalReplies + (totalReplies === 1 ? ' reply' : ' replies') }} 
         </button>

package/src/modules/community/controllers/blog.controller.js

@@ -19,6 +19,10 @@ const controllerFactory = db => {
       ...(await queryProcessorOrganizations.getFollowingStage(Membership, req.query.following)),
       // Blocking
       ...(await queryProcessorOrganizations.getBlockedStage(Membership, req.query.user)),
+      // Sorting and Pagination BEFORE lookups
+      ...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder),
+      ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit),
+      // Lookups (only on paginated documents)
       queryProcessorReactions.getCommentsLookupStage(),
       queryProcessorReactions.getReactionsLookupStage(),
       queryProcessorReactions.getReactionsCommentsFields(req.query.user),
@@ -28,11 +32,6 @@ const controllerFactory = db => {
       queryProcessorCore.getOwnerUserLookupStage(),
       queryProcessorCore.getOwnerOrganizationLookupStage(),
       queryProcessorCore.getAddFieldsCreatorOwnerStage(),
-      // Sorting and Pagination
-      ...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder),
-      ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit),
-      // For creator
-      // { $sample: { size: Number(req.query.limit) } },
     ];
     try {
       const posts = await Blogpost.aggregate(stages).exec();

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

@@ -45,6 +45,7 @@ export default db => {
       strict: false,
     }
   );
+  ReactionSchema.index({ target: 1 });
   const Reaction = db.mongoose.model('Reaction', ReactionSchema);
   return Reaction;
 };

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

@@ -0,0 +1,16 @@
+const communityBackofficeRoutes = [
+  {
+    path: '',
+    name: 'Posts',
+    meta: {
+      title: {
+        en: 'Backoffice Community',
+        ru: 'Управление Сообществом',
+      },
+      authorize: [],
+    },
+    component: () => import(/* webpackChunkName: 'BackofficeCommunity' */ '../components/pages/Posts.vue'),
+  },
+];
+
+export default communityBackofficeRoutes;

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

@@ -0,0 +1,56 @@
+const communityOrganizationRoutes = [
+  {
+    path: '',
+    name: 'Posts',
+    meta: {
+      title: {
+        en: 'Posts',
+        ru: 'Посты',
+      },
+    },
+    component: () => import(/* webpackChunkName: "organization-posts" */ '../components/pages/Posts.vue'),
+  },
+  {
+    path: 'create',
+    name: 'CreateBlogPost',
+    meta: {
+      title: {
+        en: 'Create Post',
+        ru: 'Создать Пост',
+      },
+    },
+    beforeEnter: async (to, from, next) => {
+      const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
+      return requiresAuth(to, from, next);
+    },
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
+  },
+  {
+    path: ':url',
+    name: 'BlogPost',
+    meta: {
+      title: {
+        en: 'Post',
+        ru: 'Пост',
+      },
+    },
+    component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue'),
+  },
+  {
+    path: ':url/edit',
+    name: 'EditBlogPost',
+    meta: {
+      title: {
+        en: 'Edit Post',
+        ru: 'Редактировать пост',
+      },
+    },
+    beforeEnter: async (to, from, next) => {
+      const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
+      return requiresAuth(to, from, next);
+    },
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
+  },
+];
+
+export default communityOrganizationRoutes;

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

@@ -1,107 +1,59 @@
-export function getRoutes(options = {}) {
-  const route = options.route || 'Home';
-  const routeOrganizations = options.routeOrganizations || 'OrganizationRoot';
-  const routes = [];
-  
-  // Основные роуты community в Home
-  routes.push({
-    parentName: route,
-    config: {
-      basePath: 'community',
-      component: () => import(/* webpackChunkName: "community-layout" */ '../components/layouts/Community.vue'),
-      meta: {
-        title: {
-          en: 'Community',
-          ru: 'Коммьюнити',
-        },
-        breadcrumbs: {
-          hidden: true,
-        },
-        title_hide: true,
+const communityRoutes = [
+  {
+    path: ':category?',
+    name: 'Blog',
+    meta: {
+      title: {
+        en: 'Community',
+        ru: 'Коммьюнити',
       },
-      routes: [
-        {
-          path: ':category?',
-          name: 'Blog',
-          meta: {
-            title: {
-              en: 'Community',
-              ru: 'Коммьюнити',
-            },
-            title_hide: true,
-            hideNavigationBar: true,
-          },
-          component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue'),
-        },
-        {
-          path: 'posts/create',
-          name: 'Create BlogPost',
-          meta: {
-            title: {
-              en: 'Create Post',
-              ru: 'Создать Пост',
-            },
-          },
-          beforeEnter: async (to, from, next) => {
-            const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
-            return requiresAuth(to, from, next);
-          },
-          component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
-        },
-        {
-          path: 'posts/:url',
-          name: 'BlogPost',
-          meta: {
-            title: {
-              en: 'Post',
-              ru: 'Пост',
-            },
-            title_hide: false,
-          },
-          component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue'),
-        },
-        {
-          path: 'posts/:url/edit',
-          name: 'Edit BlogPost',
-          meta: {
-            title: {
-              en: 'Edit Post',
-              ru: 'Редактировать пост',
-            },
-          },
-          beforeEnter: async (to, from, next) => {
-            const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
-            return requiresAuth(to, from, next);
-          },
-          component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
-        },
-      ],
-    }
-  });
-  
-  // Posts для Organizations
-  if (!options.withOrganizationRoutes) {
-    routes.push({
-      parentName: routeOrganizations,
-      config: {
-        basePath: 'posts',
-        routes: [
-          {
-            path: '',
-            name: 'OrganizationPosts',
-            meta: {
-              title: {
-                en: 'Posts',
-                ru: 'Посты',
-              },
-              context: 'organization'
-            },
-            component: () => import(/* webpackChunkName: "organization-posts" */ '../components/pages/Posts.vue'),
-          }
-        ]
-      }
-    });
-  }
-  
-  return routes;
-}
+      title_hide: true,
+      hideNavigationBar: true,
+    },
+    component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue'),
+  },
+  {
+    path: 'posts/create',
+    name: 'CreateBlogPost',
+    meta: {
+      title: {
+        en: 'Create Post',
+        ru: 'Создать Пост',
+      },
+    },
+    beforeEnter: async (to, from, next) => {
+      const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
+      return requiresAuth(to, from, next);
+    },
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
+  },
+  {
+    path: 'posts/:url',
+    name: 'BlogPost',
+    meta: {
+      title: {
+        en: 'Post',
+        ru: 'Пост',
+      },
+      title_hide: false,
+    },
+    component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue'),
+  },
+  {
+    path: 'posts/:url/edit',
+    name: 'EditBlogPost',
+    meta: {
+      title: {
+        en: 'Edit Post',
+        ru: 'Редактировать пост',
+      },
+    },
+    beforeEnter: async (to, from, next) => {
+      const { requiresAuth } = await import('@martyrs/src/modules/auth/views/middlewares/auth.validation.js');
+      return requiresAuth(to, from, next);
+    },
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue'),
+  },
+];
+
+export default communityRoutes;