@ozdao/prometheus-framework 0.1.30 → 0.1.31

package/src/components/Select/Select.vue

@@ -1,13 +1,17 @@
 <template>
   <!-- Input Wrapper -->
-  <div :class="$attrs.class" class="flex-nowrap flex">
+  <div 
+    @click.stop="toggleMenu"  
+    :class="$attrs.class" 
+    class="cursor-pointer flex-nowrap flex"
+  >
     <!-- Label -->
     <div v-if="label" class="t-transp mn-r-small">
       <span>{{label}}</span>
     </div>
     
     <!-- Input -->
-    <li @click.stop="toggleMenu" class="w-100">
+    <li class="w-100">
       <!-- Selected Value -->
       <span>
         {{ selectedOption?.name || selectedOption || placeholder }}
@@ -15,14 +19,14 @@
     </li>
 
     <!-- Dropdown menu -->
-    <transition mode="out-in" name="fade">
+    <transition mode="out-in" name="TransitionTranslateY">
       <ul 
         v-if="showMenu" 
         :class="$attrs.class"
-        class="pos-absolute pos-l-0 z-index-5 w-100 mn-t-big"
+        class="pos-absolute pos-t-100 pos-l-0 z-index-5 w-100 mn-t-thin"
       >
-        <li v-for="option in optionsListed">
-          <span v-if="option" @click="selectOption(option)" class="w-100">
+        <li @click.stop="selectOption(option)" v-for="option in optionsListed">
+          <span v-if="option" class="w-100">
             {{ option.name || option }}
           </span>
         </li>

package/src/main.ts

@@ -2,7 +2,7 @@ import type { App } from 'vue';
 
 // Define Styles
 // ------------------------------------- //
-import '@pf/styles/theme.scss';
+import '@pf/src/styles/theme.scss';
 // Define components
 // ------------------------------------- //
 import { 

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

@@ -45,6 +45,12 @@
 				class="bg-grey pd-small radius-small mn-thin"
 			/>
 		</div>
+		<div
+			 v-if="route.query.method !== 'reset-password'" 
+			 class="p-medium t-semi mn-semi "
+		>
+			 By registering, you agree to our <a class="t-second" href="https://thecommunephuket.com/legal/eula" target="_blank" rel="noopener noreferrer">End User License Agreement (EULA)</a>
+		</div>
 		<!-- Button -->
 		<Button :submit="onSubmit" :callback="redirectTo" class="mn-big">
 			<span  v-if="route.query.method === 'reset-password'">{{ t('changePasswordBtn') }}</span>

package/src/modules/auth/router/auth.js

@@ -27,7 +27,7 @@ const auth = [
           ru: 'Вход'
         },
       },
-      component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
+      component: () => import(/* webpackChunkName: "signin" */ '../components/pages/EnterPassword.vue'),
     },{
       path: 'reset-password',
       name: 'Reset Password',

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

@@ -13,7 +13,7 @@
   // State
   const state = reactive({
     user: {
-      _id: '',
+      _id: undefined,
       username: '',
       email: '',
       phone: '',

package/src/modules/backoffice/components/layouts/Backoffice.vue

@@ -1,9 +1,9 @@
 <template>
-  <section id="account" class="cols-2-1_3 gap-medium pd-medium">
+  <section id="account" class="cols-1 gap-medium pd-medium">
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Page Tabs  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="pd-medium menu-tabs">
+    <!-- <div class="pd-medium menu-tabs">
       <button 
         @click="$router.push('/account/community')" 
         :class="{'product-tab-active': $route.path === '/account/community'}" 
@@ -18,7 +18,7 @@
       >
         Gallery
       </button>
-    </div>
+    </div> -->
 
     <div class="w-100">
       <router-view  v-slot="{ Component, route }">

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

@@ -0,0 +1,62 @@
+<template>
+	<div class="">
+		<h1 class="mn-small">Your Backoffice</h1>
+		<Menu 
+				class="bg-grey"
+			>
+			  <MenuItem 
+			  	@click="router.push({
+			  		name: 'Backoffice Gallery', 
+			  		params: {
+			  			_id: route.params._id
+			  		}
+			  	})" 
+			  	class="cursor-pointer">
+			    <span>
+			    	Gallery
+			    </span>
+			  </MenuItem>
+
+			  <MenuItem 
+			  	@click="router.push({
+			  		name: 'Backoffice Reports', 
+			  		params: {
+			  			_id: route.params._id
+			  		}
+			  	})" 
+			  	class="cursor-pointer">
+			    <span>
+			    	Reports
+			    </span>
+			  </MenuItem>
+			</Menu>
+	</div>
+</template>
+
+<script setup="props">
+/////////////////////////////
+// COMPONENT DEPENDENCIES
+/////////////////////////////
+// Mobile Module
+import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+/////////////////////////////
+// HELPERS
+/////////////////////////////
+import { useRoute, useRouter } from 'vue-router'
+const route = useRoute()
+const router = useRouter()
+/////////////////////////////
+// CREATED
+/////////////////////////////
+const props = defineProps({
+  favorites: Array,
+});
+
+/////////////////////////////
+// MOUNTED
+/////////////////////////////
+</script>
+
+<style lang="scss">
+</style>

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

@@ -1,8 +1,12 @@
 import layoutBackoffice from '../components/layouts/Backoffice.vue'
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
 const backofficeRoutes = [{
   path: 'backoffice',
   component: layoutBackoffice,
+  beforeEnter: [
+    validationAuth.requiresAdmin,
+  ],
   children: [{
     path: ':_id',
     name: 'Backoffice',
@@ -13,7 +17,29 @@ const backofficeRoutes = [{
       },
       authorize: []
     },
+    component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '../components/pages/Dashboard.vue'),
+  },{
+    path: ':_id/gallery',
+    name: 'Backoffice Gallery',
+    meta: {
+      title: {
+        en: 'Backoffice Gallery',
+        ru: 'Управление Галерей'
+      },
+      authorize: []
+    },
     component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/gallery/components/sections/BackofficeGallery.vue'),
+  },{
+    path: ':_id/reports',
+    name: 'Backoffice Reports',
+    meta: {
+      title: {
+        en: 'Backoffice Reports',
+        ru: 'Управление Жалобами'
+      },
+      authorize: []
+    },
+    component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/reports/components/pages/BackofficeReports.vue'),
   }]
 }];
 

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

@@ -20,6 +20,9 @@
 		    	'mn-small pd-medium': type !== 'short',
 		    	'flex-child-order-last flex-child mn-l-small': type === 'short',
 		    }"
+		    :entity="blogpost"
+		    :entityType="'blogpost'"
+		    :user="user"
 		    :owner="blogpost.owner" 
 	    	:creator="blogpost.creator"
 	    	:date="blogpost.createdAt"

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

@@ -23,19 +23,19 @@
     	</h2>
 		</header>
 		
-		<ul class="w-100 bg-grey pd-small radius-big mn-semi flex-nowrap flex">
+		<ul class="w-100 bg-grey pd-small radius-big mn-semi gap-thin 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-thin radius-small">👑 Featured</li>
+			class="t-medium  pd-thin radius-small">👑 Featured</li>
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'popular' }"					 				
 			@click="router.push({name: 'Blog', params: { category: 'popular' } })" 
-			class="mn-r-small t-medium  pd-thin radius-small">🔥 Popular</li>
+			class="t-medium  pd-thin radius-small">🔥 Popular</li>
 			<li  	
 			:class="{'t-white bg-black': route.params.category === 'new'}" 					
 			@click="router.push({name: 'Blog', params: { category: 'new' } })" 
-			class="mn-r-small t-medium  pd-thin radius-small">🆕 New</li>
+			class="t-medium  pd-thin radius-small">🆕 New</li>
 			<li 	
 			v-if="auth.state.user._id"
 			:class="{'t-white bg-black': route.params.category === 'following'}" 		

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

@@ -36,38 +36,37 @@
       title="Добавить участника" 
       @close-popup="closePublicationPopup" 
       :isPopupOpen="isPublicationPopup"
+      class="w-m-33r t-left pd-big bg-white radius-big"
     >
-      <div class="w-m-66r t-left pd-big bg-white radius-big">
-        <h3 class="mn-small">Final Touches</h3>
-        
-        <BlockTags
-          @tags-changed="newTags => post.tags = newTags"
-          :tags="post.tags"
-        />
+      <h3 class="mn-small">Final Touches</h3>
+      
+      <BlockTags
+        @tags-changed="newTags => post.tags = newTags"
+        :tags="post.tags"
+      />
 
-        <h5 class="mn-thin">Add to public:</h5>
-        <SelectMulti
-          v-model="selectedOrganization"
-          :options="publics"
-          :multiple="false"
-          :taggable="false"
-          placeholder="Type to search or add tag"
-          label="name"
-          track-by="_id"
-          class="mn-medium bg-grey radius-medium pd-small"
+      <h5 class="mn-thin">Add to public:</h5>
+      <SelectMulti
+        v-model="selectedOrganization"
+        :options="publics"
+        :multiple="false"
+        :taggable="false"
+        placeholder="Type to search or add tag"
+        label="name"
+        track-by="_id"
+        class="mn-medium bg-grey radius-medium pd-small"
+      />
+      <h5 v-if="selectedOrganization" class="mn-thin">Options:</h5>
+      <div v-if="selectedOrganization" class="mn-medium br-grey br-2px br-solid pd-small radius-big">
+        <Checkbox 
+          :label="'Hide Author'"
+          :radio="post.creator.hidden"
+          @update:radio="event => post.creator.hidden = event"
+          name="prices"
+          class="w-100"
         />
-        <h5 v-if="selectedOrganization" class="mn-thin">Options:</h5>
-        <div v-if="selectedOrganization" class="mn-medium br-grey br-2px br-solid pd-small radius-big">
-          <Checkbox 
-            :label="'Hide Author'"
-            :radio="post.creator.hidden"
-            @update:radio="event => post.creator.hidden = event"
-            name="prices"
-            class="w-100"
-          />
-        </div>
-        <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
       </div>
+      <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
     </Popup>
     
   </article>

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

@@ -19,10 +19,12 @@
 
       <CardHeader 
         class="mn-medium"
+        :entity="comment"
+        :entityType="'comment'"
+        :user="owner"
         :owner="{target: comment.user}" 
         :creator="{target: comment.user}"
         :date="comment.createdAt"
-
       />
       <div class="pd-t-zero">
         <p class="p-big">{{ comment.content }}</p>
@@ -44,7 +46,7 @@ const comments = ref([]);
 const commentContent = ref('');
 
 const fetchComments = async () => {
-  const { data } = await $axios.get(`/comments/read?type=${props.type}&target=${props.target}`);
+  const { data } = await $axios.get(`/comments/read?type=${props.type}&target=${props.target}&user=${props.owner}`);
   comments.value = data;
 };
 

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

@@ -95,8 +95,8 @@
         category: props.category,
         user: props.user,
         owner: props.owner,
-        status: props.status,
         creator: props.creator,
+        status: props.status,
         period: props.period,
       });
 

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

@@ -1,3 +1,5 @@
+const { getBlockedMembers, addConditionsForBlocked } = require('@pf/src/modules/organizations/controllers/utils/excludeBlockedMembers');
+
 const controllerFactory = (db) => {
   const Blogpost = db.blogpost;
   const Organization = db.organization;
@@ -31,6 +33,18 @@ const controllerFactory = (db) => {
       matchStage["creator.target"] = new db.mongoose.Types.ObjectId(req.query.creator);
     }
 
+    // EXCLUDE USERS AND ORGS BLOCKED BY USER
+    if (req.query.user) {
+      const blockedMembers = await getBlockedMembers(Membership, req.query.user);
+
+      console.log(blockedMembers);
+
+      if (blockedMembers.length > 0) {
+          addConditionsForBlocked(matchStage, "owner.target", blockedMembers);
+          addConditionsForBlocked(matchStage, "creator.target", blockedMembers);
+      }
+    }
+    
     if (req.query.tags) {
       matchStage["tags"] = { $in: req.query.tags.split(',') };
     }
@@ -55,6 +69,9 @@ const controllerFactory = (db) => {
         matchStage["createdAt"] = { $gte: date };
     }
 
+
+
+    // FILTER BY CATEGORY
     if (req.query.category) {
         switch (req.query.category) {
           case 'featured':
@@ -67,8 +84,8 @@ const controllerFactory = (db) => {
             query.push({ $sort: { createdAt: -1 } });
             break;
           case 'following':
-            if (req.query.user) {
-                const memberships = await Membership.find({ user: req.query.user });
+            if (req.query.user) { 
+               const memberships = await Membership.find({ user: req.query.user });
                 const followedOrganizations = memberships.filter(membership => membership.type === 'organization').map(membership => membership.target);
                 const followedAuthors = memberships.filter(membership => membership.type === 'user').map(membership => membership.target);
 
@@ -81,9 +98,11 @@ const controllerFactory = (db) => {
         }
     }
 
+
+
+
     query.push({ $match: matchStage });
 
-          console.log(matchStage)
 
     query.push({
       $lookup: {

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

@@ -1,12 +1,29 @@
 const commentControllerFactory = (db) => {
   const Comment = db.comment;
+   const Membership = db.membership;
 
   const read = async (req, res) => {
     try {
-      const comments = await Comment.find({ target: req.query.target })
+      let conditions = { target: req.query.target }; // базовое условие для поиска комментариев
+
+      // Если в запросе есть пользователь, мы исключаем комментарии от заблокированных пользователей
+      if (req.query.user) {
+        const memberships = await Membership.find({ user: req.query.user });
+        const blockedMembers = memberships
+          .filter(membership => membership.role === 'blocked')
+          .map(membership => membership.target);
+
+        // Если есть заблокированные пользователи, добавляем условие в запрос
+        if (blockedMembers.length > 0) {
+          conditions.user = { "$nin": blockedMembers }; // добавляем условие, исключающее заблокированных пользователей
+        }
+      }
+
+      // Теперь мы добавили условия, исключающие комментарии от заблокированных пользователей, в наш запрос.
+      const comments = await Comment.find(conditions)
         .populate({
           path: 'user',
-          select: 'username profile.photo _id'
+          select: 'username profile.photo profile.name _id'
         });
 
       if (!comments) {
@@ -26,6 +43,7 @@ const commentControllerFactory = (db) => {
     }
   };
 
+
   const create = async (req, res) => {
     try {
       const comment = new Comment({
@@ -38,8 +56,8 @@ const commentControllerFactory = (db) => {
       const data = await comment.save();
       const populatedComment = await Comment.findOne({ _id: data._id })
         .populate({
-           path: 'user',
-          select: 'username profile.photo _id'
+          path: 'user',
+          select: 'username profile.photo profile.name _id'
         });
 
       res.status(200).send(populatedComment);
@@ -56,7 +74,7 @@ const commentControllerFactory = (db) => {
       const comment = await Comment.findByIdAndUpdate(req.params._id, req.body, { new: true })
         .populate({
           path: 'user',
-          select: 'username profile.photo _id'
+          select: 'username profile.photo profile.name _id'
         });
 
       if (!comment) {

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

@@ -5,11 +5,15 @@
 	  }"
 	  class="pos-relative"
   >
+  
     <CardHeader 
 	    :class="{
 	    	'mn-small pd-medium': type !== 'short',
 	    	'flex-child-order-last flex-child mn-l-small': type === 'short',
 	    }"
+	    :entity="event"
+	    :entityType="'event'"
+	    :user="user"
 	    :owner="event.owner" 
     	:creator="event.creator"
     	:members="event.numberOfTickets"

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

@@ -45,38 +45,37 @@
       title="Добавить участника" 
       @close-popup="closePublicationPopup" 
       :isPopupOpen="isPublicationPopup"
+      class="w-m-33r t-left pd-big bg-white radius-big"
     >
-      <div class="w-m-66r t-left pd-big bg-white radius-big">
-        <h3 class="mn-small">Final Touches</h3>
-        
-        <BlockTags
-          @tags-changed="newTags => event.tags = newTags"
-          :tags="event.tags"
-        />
+      <h3 class="mn-small">Final Touches</h3>
+      
+      <BlockTags
+        @tags-changed="newTags => event.tags = newTags"
+        :tags="event.tags"
+      />
 
-        <h5 class="mn-thin">Add to public:</h5>
-        <SelectMulti
-          v-model="selectedOrganization"
-          :options="publics"
-          :multiple="false"
-          :taggable="false"
-          placeholder="Type to search or add tag"
-          label="name"
-          track-by="_id"
-          class="mn-medium bg-grey radius-medium pd-small"
+      <h5 class="mn-thin">Add to public:</h5>
+      <SelectMulti
+        v-model="selectedOrganization"
+        :options="publics"
+        :multiple="false"
+        :taggable="false"
+        placeholder="Type to search or add tag"
+        label="name"
+        track-by="_id"
+        class="mn-medium bg-grey radius-medium pd-small"
+      />
+      <h5 v-if="selectedOrganization" class="mn-thin">Options:</h5>
+      <div v-if="selectedOrganization" class="mn-medium br-grey br-2px br-solid pd-small radius-big">
+        <Checkbox 
+          :label="'Hide Author'"
+          :radio="event.creator.hidden"
+          @update:radio="updateEvent => event.creator.hidden = updateEvent"
+          name="prices"
+          class="w-100"
         />
-        <h5 v-if="selectedOrganization" class="mn-thin">Options:</h5>
-        <div v-if="selectedOrganization" class="mn-medium br-grey br-2px br-solid pd-small radius-big">
-          <Checkbox 
-            :label="'Hide Author'"
-            :radio="event.creator.hidden"
-            @update:radio="updateEvent => event.creator.hidden = updateEvent"
-            name="prices"
-            class="w-100"
-          />
-        </div>
-        <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
       </div>
+      <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
     </Popup>
   </article>
 </template>

package/src/modules/events/components/sections/Feed.vue

@@ -26,7 +26,7 @@ f<template>
         v-for="(event,index) in eventsList" 
         :key="event._id" 
         :event="event" 
-        :owner="user" 
+        :user="user" 
         :type="'normal'"
         class="bg-grey radius-big mn-medium"
         :class="{

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

@@ -1,8 +1,11 @@
 const ObjectId = require('mongoose').Types.ObjectId;
+const { getBlockedMembers, addConditionsForBlocked } = require('@pf/src/modules/organizations/controllers/utils/excludeBlockedMembers');
+
 
 const middlewareFactory = (db) => {
   const Ticket = db.ticket; // замена Membership на Ticket
   const Event = db.event;
+  const Membership = db.membership;
 
   const read = async (req, res) => {
 
@@ -103,16 +106,6 @@ const middlewareFactory = (db) => {
           break;
       }
     }
-    const matchConditions = [
-      ...(dateConditions.length > 0 ? [{ $and: dateConditions }] : []),
-      ...(req.query.url ? [{ url: req.query.url }] : []),
-      ...(req.query.owner ? [{ "owner.target": new ObjectId(req.query.owner) }] : []),
-      ...(req.query.creator ? [{ "creator.target": new ObjectId(req.query.creator) }] : []),
-    ];
-
-    const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
-
-    console.log(dateConditions)
 
     const stages = [
        ...(matchStage != null ? [matchStage] : []),

package/src/modules/gallery/components/sections/BackofficeGallery.vue

@@ -1,26 +1,11 @@
 <template>
   <div class="pos-relative w-100">
-    <!-- <GradientOverlay> -->
-      <div class="w-100 o-hidden">
-      <div class=" pd-medium flex-nowrap flex pd-t-thin pd-b-thin o-scroll">
-        
-        <button  v-if="isEditablePath" @click="openModal(null)" class="mn-r-small t-white t-black bg-second button-small button">Add photos +</button>
-<!-- 
-        <a 
-          v-for="category in categories" 
-          :key="category" 
-          @click="filter(category)" 
-          class="h3 uppercase mn-r-big"
-          :class="{ 't-transp': selectedCategory !== category }"
-        >
-          {{ $t('gallery.categories.' + category) }}
-        </a> -->
-
-      </div>
-      </div>
-    <!-- <GradientOverlay/> -->
+    <div class="mn-semi flex-v-center flex-nowrap flex">
+      <h1 class="mn-r-small">Manage Gallery</h1>
+      <button  v-if="isEditablePath" @click="openModal(null)" class="t-white t-black bg-second i-big radius-extra">+</button>
+    </div>
 
-    <div ref="grid" class="pd-medium cols-4 gap-thin">
+    <div ref="grid" class="cols-4 gap-thin">
        <!-- :class="['grid-item pd-small', item.size.value, ...item.categories]" -->
       <div 
         v-for="(item, index) in filteredGallery" 
@@ -35,11 +20,10 @@
             class="w-100 h-100 o-hidden radius-medium object-fit-cover" 
             @click="openModal(item.image)"
           />
-          <div class="pd-small radius-small bg-white" v-else>
-            {{item._id}}
+          <div class="radius-small bg-white" v-else>
             <img :src="'https://thecommunephuket.com/photos/' + item.cover" class="w-100 radius-small mn-small h-10r object-fit-cover " @click="openModal(item)" />
             
-            <p class="t-black p-small mn-small">
+            <p class="t-black p-small mn-thin">
               <span class="uppercase t-transp ">Size</span>
               <br>
               <span class="pd-2px radius-big d-inline-block bg-grey">{{item.size.name}}</span>

package/src/modules/icons/navigation/IconCross.vue

@@ -0,0 +1,22 @@
+<template>
+	<svg 
+		width="26"
+		height="26" 
+		viewBox="0 0 26 26" 
+		fill="none" 
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<rect 
+			width="24"
+			height="24" 
+			transform="translate(1 1)" 
+		/>
+		<path 
+			fill="rgb(var(--black))"
+			fill-rule="evenodd" 
+			clip-rule="evenodd" 
+			d="M12.9996 10.8L22.8994 0.900244L25.0993 3.1002L15.1995 13L25.0993 22.8998L22.8994 25.0998L12.9996 15.2L3.09976 25.0998L0.899801 22.8998L10.7996 13L0.899801 3.1002L3.09976 0.900244L12.9996 10.8Z"/>
+	</svg>
+</template>
+
+<script></script>