@ozdao/prometheus-framework 0.2.221 → 0.2.223

package/src/modules/reports/components/sections/FormReport.vue

@@ -61,29 +61,29 @@
  	// ///////////////////////////////////////
  	const props = defineProps({
  		user: {
-	      type: String,
-	      required: false
-	    },
-	    type: {
-	      type: String,
-	      required: false
-	    },
-	    reason: {
-	      type: String,
-	      required: false
-	    },
-	    target: {
-	      type: String,
-	      required: true
-	    },
-	    text: {
+      type: String,
+      required: false
+    },
+    type: {
+      type: String,
+      required: false
+    },
+    reason: {
+      type: String,
+      required: false
+    },
+    target: {
+      type: String,
+      required: true
+    },
+	  text: {
 			type: String,
 			default: '!'
 		},
-	    status: {
-	      type: String,
-	      default: 'new'
-	    }
+    status: {
+      type: String,
+      default: 'new'
+    }
  	})
  	// ///////////////////////////////////////
  	// Form Logic

package/src/modules/spots/store/spots.js

@@ -1,14 +1,9 @@
-// Dependencies
-import axios from 'axios';
-import Cookies from 'js-cookie'
 // Vue modules
 import { reactive, watch  } from "vue";
 // Globals 
 import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
-// Setup Cookies
-$axios.defaults.withCredentials = true
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // State
 const state = reactive({
   spots: [],

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

@@ -160,7 +160,7 @@
 
 			<Menu class="mn-b-regular bg-light">
 
-			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
+			  <MenuItem @click="router.push({name: 'User Events', params: {user: route.params._id}})" class="cursor-pointer">
 			    <IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 			    <span>Events</span>
 			  </MenuItem> 

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

@@ -34,7 +34,7 @@ const users = [{
   },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileBlogposts.vue'),
 },{
-  path: 'profile/:_id/events',
+  path: 'profile/:user/events',
   name: 'User Events',
   meta: {
     title: {
@@ -42,7 +42,7 @@ const users = [{
       ru: 'События'
     }
   },
-  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEvents.vue'),
+  component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/events/components/pages/EventsBackoffice.vue'),
 },{
   path: 'profile/:_id/organizations',
   name: 'User Organizations',

package/src/modules/users/store/users.js

@@ -1,8 +1,6 @@
 import { reactive, ref, computed, toRefs, watch  } from "vue";
 
-import axios from 'axios';
-
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 
 const state =  reactive({
   all: [],

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');

package/src/modules/auth/controllers/middlewares/verifyAccesses.js

@@ -1,114 +0,0 @@
-const middlewareFactory = (db) => {
-  const User = db.user;
-  const Organization = db.organization;
-  const Department = db.department;
-
-  const verifyRead = (resource) => {
-    return async (req, res, next) => {
-      try {
-        if (req.userId === null) {
-          req.query.status = 'published';
-          return next();
-        }
-        // Получаем текущего пользователя
-        const userId = new db.mongoose.Types.ObjectId(req.userId);
-        
-        // Получаем идентификатор организации из запроса
-        const ownerOrgId = new db.mongoose.Types.ObjectId(req.query.owner);;
-
-        // Проверяем, является ли пользователь владельцем организации
-        const isOwnerOfOrg = await Organization.exists({
-          _id: ownerOrgId,
-          owner: userId
-        });
-
-        // Если пользователь является владельцем организации, ему разрешен доступ ко всем ресурсам
-        if (isOwnerOfOrg) {
-          return next();
-        }
-
-        // Проверяем, является ли пользователь членом организации через департаменты
-        const isMemberOfOrg = await Department.exists({
-          organization: ownerOrgId,
-          'members.user': userId
-        });
-
-
-        if (!isMemberOfOrg) {
-          // Если пользователь не является членом организации, ограничиваем доступ к опубликованным ресурсам
-          req.query.status = 'published';
-        } else {
-
-          // Находим все департаменты данной организации, к которым относится пользователь
-          const departments = await Department.find({ organization: ownerOrgId });
-
-          // Проверяем доступ пользователя ко всем ресурсам
-          let hasAccess = false;
-
-          for (const department of departments) {
-            const accessRights = department.accesses[resource];
-
-            if (accessRights && accessRights.read) {
-              // Если хотя бы в одном департаменте есть права на чтение ресурса, разрешаем доступ
-              hasAccess = true;
-              break;
-            }
-          }
-
-          if (!hasAccess) {
-            // Если у пользователя нет прав на чтение данного ресурса ни в одном департаменте, ограничиваем доступ к опубликованным ресурсам
-            req.query.status = 'published';
-          }
-        }
-
-        next();
-      } catch (err) {
-        console.error('Access control error:', err);
-        return res.status(403).json({ error: 'Access denied' });
-      }
-    };
-  };
-
-   // Middleware для проверки доступа
-  const verifyModify = (action, resource) => {
-    return async (req, res, next) => {
-      try {
-        const user = req.userId; 
-
-        const department = await Department.findOne({
-          owner: organizationId
-        });
-
-        if (!department) {
-          return res.status(403).json({
-            message: "Access forbidden"
-          });
-        }
-
-        const accesses = department.accesses;
-
-        // Проверяем права доступа пользователя к ресурсу
-        const resourceAccess = accesses[resource];
-        if (!resourceAccess || !resourceAccess[action]) {
-          return res.status(403).json({
-            message: "Access forbidden"
-          });
-        }
-
-        next();
-      } catch (error) {
-        console.error("Access control error:", error);
-        return res.status(500).json({
-          message: "Internal server error"
-        });
-      }
-    };
-  };
-
-
-  return {
-    verifyRead,
-  };
-};
-
-module.exports = middlewareFactory;

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

@@ -1,69 +0,0 @@
-<template>
-	<div 
-		class="pd-thin"
-	>
-		<header 
-			class="mn-b-medium flex-v-center flex-nowrap flex"
-		>
-	      	<h2
-	      		class="mn-r-medium"
-	      	>
-	      		Events
-	      	</h2>
-	      	
-	      	<button 
-	      		v-if="auth.state.user._id === route.params._id"
-	      		@click="router.push({name: 'Create Event'})" 
-	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
-	      	>
-	      		+
-	      	</button>
-		</header>
-
-		<Tab 
-			v-model:selected="tabOrganization"
-			:tabs="[
-				{ name: 'My', 	value: 'owner' },
-				{ name: 'Participant', 	value: 'participant' },	
-			]"
-			class="mn-b-small o-hidden h5 radius-big bg-light"
-		/>
-
-		<Feed 
-			v-if="tabOrganization ==='owner'"
-	  		:user="auth.state.user._id"
-			:creator="route.params._id"
-			:sortOrder="'asc'"
-		/>
-
-		<Feed 
-			v-if="tabOrganization ==='participant'"
-	  		:user="auth.state.user._id"
-	  		:participant="route.params._id"
-			:sortOrder="'desc'"
-		/>
-	</div>
-</template>
-
-<script setup>
-	import { watch, ref } from 'vue'
-	import { useRoute, useRouter } from 'vue-router'
-	// Components
-	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	import Feed from '@pf/src/modules/events/components/sections/Feed.vue'; 
-
-	import * as auth from '@pf/src/modules/auth/views/store/auth';
-	// Accessing router
-	const route = useRoute()
-	const router = useRouter()
-	// State
-	let tab = route.query.tab ? route.query.tab : 'owner';
-
-	const tabOrganization = ref(tab)
-
-	route.query.tab = tabOrganization.value
-
-	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: { ...route.query, tab: newValue } });
-	});
-</script>