@ozdao/prometheus-framework 0.2.127 → 0.2.129

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

@@ -43,16 +43,10 @@ const controllerFactory = (db) => {
     try {
       let user = await User.findOne(query).populate('roles').exec();
 
-      if ((type === 'email' || type === 'phone')) {
-
-        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
-
-        if (!passwordIsValid) {
-          console.log('req obdy is', req.body)
-          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
-        }
+      if (type !== 'apple' && !user) {
+        return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-    
+
       if (type === 'apple' && !user) {
         const { firstName, lastName } = req.body.user.name;
 
@@ -67,12 +61,18 @@ const controllerFactory = (db) => {
       } else if (!user) {
         return res.status(404).send({ errorCode: "USER_NOT_FOUND" });
       }
-      
-      const memberships = await Membership.findOne({ user: user._id });
+
+      if (type === 'email' || type === 'phone') {
+
+        const passwordIsValid = bcrypt.compareSync(req.body.password, user.password);
+
+        if (!passwordIsValid) {
+          return res.status(401).send({ errorCode: "INCORRECT_PASSWORD_ENTERED", accessToken: null });
+        }
+      }
       
       const token = jwt.sign({ 
         _id: user._id, 
-        organization: memberships ? memberships.organization : null
       }, process.env.SECRET_KEY, { 
         expiresIn: 86400 
       });
@@ -87,12 +87,9 @@ const controllerFactory = (db) => {
         email: user.email,
         roles: authorities,
         accessToken: token,
-        organization: {
-          _id: memberships ? memberships.organization : null
-        }
       });
     } catch (err) {
-      // console.error(err);
+      console.error(err);
       res.status(500).send({ message: err });
     }
   };
@@ -229,56 +226,43 @@ const controllerFactory = (db) => {
     try {
       const uid = new db.mongoose.Types.ObjectId(req.userId);
       const depts = await Department.find({ 'members.user': uid });
-
-      // Fetch organizations where the user is the owner
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map(org => org._id.toString());
-
       const accesses = {};
 
-      depts.forEach(dept => {
-        const orgId = dept.organization.toString();
-
+      const processAccesses = (orgId, isOwner) => {
         if (!accesses[orgId]) {
           accesses[orgId] = {
             organization: orgId,
             rights: {}
           };
         }
+        const rights = accesses[orgId].rights;
 
-        const existingAccess = accesses[orgId].rights;
-
-        Object.keys(dept.accesses).forEach(key => {
-          if (!existingAccess[key]) {
-            existingAccess[key] = {};
-          }
+        const defaultAccesses = new Department
 
-          const rights = dept.accesses[key];
+        console.log(defaultAccesses)
 
-          Object.keys(rights).forEach(right => {
-            existingAccess[key][right] = existingAccess[key][right] || rights[right];
+        const accessData = isOwner ? defaultAccesses.accesses : (depts.find(dept => dept.organization.toString() === orgId) || {}).accesses;
+       
+        Object.keys(accessData).forEach(key => {
+          if (!rights[key]) {
+            rights[key] = {};
+          }
+          const accessRights = accessData[key];
+          Object.keys(accessRights).forEach(right => {
+            rights[key][right] = isOwner || rights[key][right] || accessRights[right];
           });
         });
+      };
+
+      depts.forEach(dept => {
+        const orgId = dept.organization.toString();
+        processAccesses(orgId, false);
       });
 
-      // Grant all accesses as true if the user is the owner of the organization
       ownedOrgIds.forEach(orgId => {
-        if (!accesses[orgId]) {
-          accesses[orgId] = {
-            organization: orgId,
-            rights: {}
-          };
-        }
-
-        Object.keys(depts[0].accesses).forEach(key => {
-          if (!accesses[orgId].rights[key]) {
-            accesses[orgId].rights[key] = {};
-          }
-
-          Object.keys(depts[0].accesses[key]).forEach(right => {
-            accesses[orgId].rights[key][right] = true;
-          });
-        });
+        processAccesses(orgId, true);
       });
 
       const accessArray = Object.values(accesses);

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

@@ -29,10 +29,7 @@ function createAuthRoutes (options) {
             ru: 'Вход'
           },
         },
-        component: () => import(
-          /* webpackChunkName: "signin" */ 
-          '../components/pages/SignIn.vue'
-        ),
+        component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
       },{
         path: 'reset-password',
         name: 'Reset Password',

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

@@ -31,35 +31,37 @@
   });
 
   async function initialize() {
-  try {
-    const userCookie = await getCookie('user');
+    try {
+      const userCookie = await getCookie('user');
+
+      if (userCookie) {
+        const { _id, email, phone, roles, accessToken } = userCookie;
+
+        // Установка токена в Axios интерцептор для всех запросов
+        axios.interceptors.request.use(config => {
+          config.headers['x-access-token'] = accessToken;
+          return config;
+        }, error => {
+          return Promise.reject(error);
+        });
 
-    if (userCookie) {
-      const { _id, email, phone, roles, accessToken } = userCookie;
+        // Проверка токена через серверный маршрут
+        const response = await axios.get('/api/auth/check-accesses');
+        const userAccesses = response.data;
 
-      // Установка токена в Axios интерцептор для всех запросов
-      axios.interceptors.request.use(config => {
-        config.headers['x-access-token'] = accessToken;
-        return config;
-      }, error => {
-        return Promise.reject(error);
-      });
+        // Обновление состояния приложения с информацией о пользователе и его правах доступа
+        Object.assign(state.user, { _id, email, phone });
+        Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
 
-      // Проверка токена через серверный маршрут
-      const response = await axios.get('/api/auth/check-accesses');
-      const userAccesses = response.data;
-
-      // Обновление состояния приложения с информацией о пользователе и его правах доступа
-      Object.assign(state.user, { _id, email, phone });
-      Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
-      state.accesses = userAccesses;
+        // console.log('roles by initilioze is', state.access.roles)
+        state.accesses = userAccesses;
+      }
+    } catch (error) {
+      console.error('Error initializing app:', error);
+      removeCookie('user'); 
+      state.accesses = [];
     }
-  } catch (error) {
-    console.error('Error initializing app:', error);
-    removeCookie('user'); 
-    state.accesses = [];
   }
-}
 
   initialize();
 
@@ -92,6 +94,7 @@
           roles: null
         });
 
+        console.log(error)
         setError(error)
         return Promise.reject(error);
       }
@@ -277,5 +280,6 @@
   // Module Export
   export {
     state,
+    initialize,
     actions
   };

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

@@ -1,17 +1,13 @@
 <template>
 	<div class="">
-		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
+		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice2</h1>
 		
 		<Menu 
 			class="bg-light mn-b-semi"
 		>
 			<MenuItem 
-				v-if="hasAccess(route.params._id, 'members', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Organization Members', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Organization Members'
 		  	})" 
 		  	class="cursor-pointer"
 		  >
@@ -21,26 +17,19 @@
 		    </span>
 		  </MenuItem>
 
-		  <!-- <MenuItem 
+		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Community', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Community'
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
 		    	Community
 		    </span>
-		  </MenuItem> -->
+		  </MenuItem>
 
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'products', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Products', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Products'
 		  	})" 
 		  	class="cursor-pointer">
 		  	<IconProducts class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
@@ -50,12 +39,8 @@
 		  </MenuItem>
 
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'leftovers', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Leftovers', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Leftovers'
 		  	})" 
 		  	class="cursor-pointer">
 		  	<IconLeftovers class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
@@ -65,12 +50,8 @@
 		  </MenuItem>
 
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'orders', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Backoffice Orders', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Orders'
 		  	})" 
 		  	class="cursor-pointer">
 		  	<IconOrders class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
@@ -80,12 +61,8 @@
 		  </MenuItem>
 
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'gallery', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Backoffice Gallery', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Gallery'
 		  	})" 
 		  	class="cursor-pointer">
 		  	<IconGallery class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
@@ -95,12 +72,8 @@
 		  </MenuItem>
 		  
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'events', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Backoffice Events', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Events'
 		  	})" 
 		  	class="cursor-pointer">
 		  	<IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
@@ -109,29 +82,23 @@
 		    </span>
 		  </MenuItem>
 
-		 <!--  <MenuItem 
+		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Payments', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Payments'
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
 		    	Payments
 		    </span>
-		  </MenuItem> -->
+		  </MenuItem>
 		</Menu>
 
-		<!-- <Menu 
+		<Menu 
 			class="bg-light"
 		>
 			<MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Organizations', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Organizations'
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
@@ -141,17 +108,24 @@
 
 		  <MenuItem 
 		  	@click="router.push({
-		  		name: 'Backoffice Reports', 
-		  		params: {
-		  			_id: route.params._id
-		  		}
+		  		name: 'Backoffice Pages'
+		  	})" 
+		  	class="cursor-pointer">
+		    <span>
+		    	Pages
+		    </span>
+		  </MenuItem>
+
+		  <MenuItem 
+		  	@click="router.push({
+		  		name: 'Backoffice Reports'
 		  	})" 
 		  	class="cursor-pointer">
 		    <span>
 		    	Reports
 		    </span>
 		  </MenuItem>
-		</Menu> -->
+		</Menu>
 	</div>
 </template>
 
@@ -162,8 +136,8 @@
 import { ref, onMounted } from 'vue';
 
 // Mobile Module
-import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
-import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+import Menu from '@pf/src/components/Menu/Menu.vue'
+import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
 import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
 
 import IconProducts from '@pf/src/modules/icons/entities/IconProducts.vue'
@@ -179,7 +153,6 @@ import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import * as auth  from '@pf/src/modules/auth/store/auth'
-
 import * as organizations  from '@pf/src/modules/organizations/store/organizations'
 
 const route = useRoute()

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

@@ -6,12 +6,12 @@ import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validat
 const backofficeRoutes = [{
   path: 'backoffice',
   component: layoutEmpty,
-  // beforeEnter: [
-  //   validationAuth.requiresAdmin,
-  // ],
+  beforeEnter: [
+    validationAuth.requiresAdmin,
+  ],
   children: [{
     path: '',
-    name: 'Backoffice',
+    name: 'Backoffice Admin',
     meta: {
       title: {
         en: 'Backoffice',
@@ -20,17 +20,6 @@ const backofficeRoutes = [{
       authorize: []
     },
     component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '../components/pages/Dashboard.vue'),
-  },{
-    path: 'gallery',
-    name: 'Backoffice Gallery',
-    meta: {
-      title: {
-        en: 'Backoffice Gallery',
-        ru: 'Управление Галерей'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/gallery/components/sections/BackofficeGallery.vue'),
   },{
     path: 'reports',
     name: 'Backoffice Reports',

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

@@ -36,31 +36,9 @@
     	:date="blogpost.createdAt"
 		/>
 
-		<!-- <Image :prop="{content:firstImage.content}" class="h-100"/> -->
-
-		<template
-			v-if="firstImage && firstImage.content && type !== 'blogpostPage'"
-		>
-			<img 
-				:src="(FILE_SERVER_URL || '') + firstImage.content" 
-				alt="Blog post image" 
-				class="mn-b-medium object-fit-cover w-100 h-min-10r  h-100"
-			/>
-		</template>
-
-		<template
-			v-if="!firstImage?.content && firstVideo && firstVideo.content && type !== 'blogpostPage'"
-		>
-			<div class="flex-center flex">
-	      <video controls class="mn-b-medium object-fit-cover w-100 h-min-10r h-max-20r">
-	        <source :src="firstVideo.content" type="video/mp4">
-	        Your browser does not support the video tag.
-	      </video>
-	    </div>
-		</template>
-
+	
 		<section
-			class="pd-t-zero pd-medium"
+			class="pd-t-zero pd-b-zero pd-medium"
 		>
 			
 			<div v-if="type !== 'blogpostPage'" class="cursor-pointer mn-b-thin flex-nowrap flex w-100">
@@ -102,12 +80,36 @@
 
 			<slot></slot>
 
-			<Chips 
+			<!-- <Chips 
       	v-if="type !== 'short' && blogpost.tags?.length > 0" 
       	:chips="blogpost.tags"
-     	/>
+     	/> -->
 
 		</section>
+
+			<!-- <Image :prop="{content:firstImage.content}" class="h-100"/> -->
+
+		<template
+			v-if="firstImage && firstImage.content && type !== 'blogpostPage'"
+		>
+			<img 
+				:src="(FILE_SERVER_URL || '') + firstImage.content" 
+				alt="Blog post image" 
+				class="mn-b-medium object-fit-cover w-100 h-min-10r  h-100"
+			/>
+		</template>
+
+		<template
+			v-if="!firstImage?.content && firstVideo && firstVideo.content && type !== 'blogpostPage'"
+		>
+			<!-- <div class="flex-center flex"> -->
+	      <video controls class="mn-b-medium object-fit-cover w-100 h-max-20r">
+	        <source :src="firstVideo.content" type="video/mp4">
+	        Your browser does not support the video tag.
+	      </video>
+	    <!-- </div> -->
+		</template>
+
 		
 		<FooterBlogpost 
 			class="pd-t-zero pd-medium" 

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

@@ -28,7 +28,7 @@
 		</li>
 			<li 	
 				v-if="auth.state.user._id"
-				:class="{'t-white bg-black': route.params.category === 'following'}" 		
+				:class="{'t-black bg-white': route.params.category === 'following'}" 		
 				@click="router.push({name: 'Blog', params: { category: 'following' } })" 
 				class="cursor-pointer t-medium flex-v-center flex pd-thin radius-extra"
 			>

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

@@ -1,5 +1,5 @@
 <template>
-  <article v-if="event" class="h-100 pd-thin">
+  <article v-if="event" class="h-min-100 pd-thin">
   	<div class="mn-b-thin radius-small w-100 h-10r bg-light flex-center flex-column flex">
      	<UploadImage 
         v-model:photo="event.cover"

package/src/modules/gallery/components/pages/Gallery.vue

@@ -66,11 +66,10 @@
 
 	import Feed from '@pf/src/components/Feed/Feed.vue'
 	import Popup from '@pf/src/components/Popup/Popup.vue'
+	import PhotoViewer from '@pf/src/components/PhotoViewer/PhotoViewer.vue'
 
 	import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
 
-	import PhotoViewer from '@pf/src/modules/gallery/components/blocks/PhotoViewer.vue'
-
 	import gallery from '@pf/src/modules/gallery/store/gallery';
 
 	const photos = ref([])

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

@@ -155,6 +155,7 @@ import Checkbox from '@pf/src/components/Checkbox/Checkbox.vue';
 import SelectMulti from '@pf/src/components/SelectMulti/SelectMulti.vue';
 import Popup from '@pf/src/components/Popup/Popup.vue'
 import Feed from '@pf/src/components/Feed/Feed.vue'
+import PhotoViewer from '@pf/src/components/PhotoViewer/PhotoViewer.vue'
 
 import * as auth from '@pf/src/modules/auth/store/auth';
 import * as organizations from '@pf/src/modules/organizations/store/organizations';
@@ -164,7 +165,7 @@ import gallery from '@pf/src/modules/gallery/store/gallery';
 import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
 import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
 
-import PhotoViewer from '@pf/src/modules/gallery/components/blocks/PhotoViewer.vue'
+
 
 import EditImages from '@pf/src/components/EditImages/EditImages.vue';
 import BlockTags from '@pf/src/components/FieldTags/BlockTags.vue';

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

@@ -0,0 +1,14 @@
+const gallery = [{
+  path: 'gallery',
+  name: 'Backoffice Gallery',
+  meta: {
+    title: {
+      en: 'Backoffice Gallery',
+      ru: 'Управление Галерей'
+    },
+    authorize: []
+  },
+  component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/gallery/components/sections/BackofficeGallery.vue'),
+}];
+
+export default gallery;

package/src/modules/globals/components/blocks/BlockFilter.vue

@@ -0,0 +1,44 @@
+<script setup>
+import { ref } from 'vue';
+
+import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
+import Spoiler from "@pf/src/components/Spoiler/Spoiler.vue"
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: 'Sorting Options'
+  },
+  options: {
+    type: Array
+  }
+});
+
+const filter = defineModel('filter')
+</script>
+
+<template>
+  <div class="w-100 o-hidden">
+    <Spoiler 
+      v-for="filterOption in options"
+      class="radius-small o-hidden mn-b-small"
+      :status="true"
+    >
+      <template #header>
+        <p class="cursor-pointer mn-r-auto t-medium p-big">{{ filterOption.title }}</p>
+      </template>
+
+      <template #content>
+        <Checkbox 
+          v-for="(checkbox, index) in  filterOption.options"
+          :key="index"
+          :label="checkbox.label"
+          :value="checkbox.value"
+          class="w-100 mn-t-small mn-b-small bg-white radius-small pd-small"
+          :radio="filter[filterOption.value]"
+          @update:radio="event => filter[filterOption.value] = event"
+        />
+      </template>
+    </Spoiler>
+  </div>
+</template>

package/src/modules/globals/components/blocks/CardHeader.vue

@@ -62,10 +62,12 @@
 						· by {{creator.target?.profile?.name || creator.target?.username || 'Anonymous'}}
 					</span>
 
+					<span v-if="date" class="mn-l-micro mn-r-micro ">·</span> 
+
 					<span v-if="date" class="pos-relative">
-							<Tooltip v-if="date" :text="formatDate(date)">
-						· {{getTimeElapsed(date)}}
-						 	</Tooltip>
+						<Tooltip v-if="date" :text="formatDate(date)">
+					 		{{getTimeElapsed(date)}}
+					 	</Tooltip>
 					</span>
 
 					<span v-if="dateFormatted">