@ozdao/prometheus-framework 0.2.222 → 0.2.224

package/src/modules/landing/components/sections/SectionsSection.vue

@@ -4,25 +4,25 @@
   
   <div class="cols-4 gap-thin">
     <router-link to="/marketplace" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/1.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/1.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section1.title')}}</h3>
       <p class="t-transp">{{t('section1.text')}}</p>
     </router-link >
 
     <router-link to="/spots" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/2.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/2.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section2.title')}}</h3>
       <p class="t-transp">{{t('section2.text')}}</p>
     </router-link>
 
     <router-link to="/community" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/3.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/3.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section3.title')}}</h3>
       <p class="t-transp">{{t('section3.text')}}</p>
     </router-link>
 
     <router-link to="/governance" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
-      <img loading="lazy" src="/sections/4.png" alt="" class="section-image">
+      <img loading="lazy" src="/sections/4.png" alt="" class="w-100 object-fit-cover">
       <h3 class="mn-b-medium">{{t('section4.title')}}</h3>
       <p class="t-transp">{{t('section4.text')}}</p>
     </router-link>
@@ -62,8 +62,5 @@
 </script>
 
 <style lang="scss">
-.section-image {
-  width: 100%;
-  object-fit: cover;
-}
+
 </style>

package/src/modules/landing/router/landing.js

@@ -18,7 +18,8 @@ const landing = [
       title: {
         en: 'Governance',
         ru: 'Управления'
-      }
+      },
+      header_theme: 'dark',
     },
     component: () => import(/* webpackChunkName: 'Governance' */ '@pf/src/modules/landing/components/pages/Governance.vue'),
   },

package/src/modules/orders/store/orders.js

@@ -1,9 +1,7 @@
 // Dependencies
 import { reactive, ref, computed, toRefs, watch  } from "vue";
-// Axios
-import axios from 'axios';
 // Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // Globals
 import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Init State

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -139,6 +139,35 @@
           <p class="p-medium mn-b-small">Please select organization accesses for user in department:</p>
           
           <div class="cols-1 gap-thin">
+            <h4>Events</h4>
+            <Checkbox
+              label="Read events"
+              name="readProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.read"
+              @update:radio="updated => (departments.state.department.accesses.events.read = !departments.state.department.accesses.events.read)"
+            />
+            <Checkbox
+              label="Create events"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.create"
+              @update:radio="updated => (departments.state.department.accesses.events.create = !departments.state.department.accesses.events.create)"
+            />
+            <Checkbox
+              label="Edit events"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.edit"
+              @update:radio="updated => (departments.state.department.accesses.events.edit = !departments.state.department.accesses.events.edit)"
+            />
+            <Checkbox
+              label="Delete events"
+              name="deleteProducts"
+              class="w-100 bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.events.delete"
+              @update:radio="updated => (departments.state.department.accesses.events.delete = !departments.state.department.accesses.events.delete)"
+            />
             <h4>Gallery</h4>
             <Checkbox
               label="Read gallery"
@@ -147,6 +176,13 @@
               :radio="departments.state.department.accesses.gallery.read"
               @update:radio="updated => (departments.state.department.accesses.gallery.read = !departments.state.department.accesses.gallery.read)"
             />
+            <Checkbox
+              label="Create photos"
+              name="editProducts"
+              class="w-100 mn-r-small bg-white radius-small pd-small"
+              :radio="departments.state.department.accesses.gallery.create"
+              @update:radio="updated => (departments.state.department.accesses.gallery.create = !departments.state.department.accesses.gallery.create)"
+            />
             <Checkbox
               label="Edit gallery"
               name="editProducts"

package/src/modules/organizations/components/pages/OrganizationBackoffice.vue

@@ -2,6 +2,8 @@
 	<div class="">
 		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
 		
+		{{auth.state.accesses}}
+
 		<Menu 
 			class="bg-light mn-b-semi"
 		>
@@ -97,7 +99,7 @@
 		  <MenuItem 
 		  	v-if="hasAccess(route.params._id, 'events', 'read', auth.state.accesses)"
 		  	@click="router.push({
-		  		name: 'Backoffice Events', 
+		  		name: 'Events Backoffice', 
 		  		params: {
 		  			_id: route.params._id
 		  		}

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

@@ -68,6 +68,8 @@ const controllerFactory = (db) => {
       ...(
         req.query.postable ? [{ 
           $or: [{ 
+            owner: new ObjectId(req.query.postable) 
+          },{ 
             $and: [{ 
               types: { 
                 $elemMatch: { $eq: 'public' } 
@@ -347,7 +349,6 @@ const controllerFactory = (db) => {
     ];
 
     try {
-      console.log(stages)
       const organizations = await Organization.aggregate(stages);
       res.status(200).send(organizations);
     } catch(err) {

package/src/modules/organizations/middlewares/verifyAccesses.js

@@ -0,0 +1,117 @@
+const middlewareFactory = (db) => {
+  const User = db.user;
+  const Organization = db.organization;
+  const Department = db.department;
+
+  const verifyAccess = (resource, accessType) => {
+    return async (req, res, next) => {
+      try {
+        const userId = req.userId ? new db.mongoose.Types.ObjectId(req.userId) : null;
+
+        let ownerData = req.body.owner || req.query.owner;
+
+        let accessResult = {
+          isAuthenticated: userId !== null,
+          isOrgOwner: false,
+          isOrgMember: false,
+          isAuthorized: false,
+          isPersonalOwner: false
+        };
+
+        // Проверка, является ли owner объектом
+        if (typeof ownerData === 'object' && ownerData !== null) {
+          if (ownerData.type === 'Organization') {
+            ownerData = ownerData.target;
+          } else if (ownerData.type === 'User') {
+            accessResult.isPersonalOwner = ownerData.target === userId.toString();
+          }
+        }
+
+        // Если это личный ресурс пользователя
+        if (accessResult.isPersonalOwner) {
+          accessResult.isAuthorized = true;
+          req.accessResult = accessResult;
+          return next();
+        }
+
+        // Если owner - организация
+        if (!accessResult.isPersonalOwner) {
+          console.log('owner data', ownerData)
+          const ownerOrgId = new db.mongoose.Types.ObjectId(ownerData);
+
+          // Проверка на владельца организации
+          accessResult.isOrgOwner = await Organization.exists({
+            _id: ownerOrgId,
+            owner: userId
+          });
+
+          if (accessResult.isOrgOwner) {
+            accessResult.isAuthorized = true;
+            req.accessResult = accessResult;
+            return next();
+          }
+
+          // Проверка членства в организации
+          const departments = await Department.find({
+            organization: ownerOrgId,
+            'members.user': userId
+          });
+
+          accessResult.isOrgMember = departments.length > 0;
+
+          if (accessResult.isOrgMember) {
+            // Проверка прав доступа
+            accessResult.isAuthorized = departments.some(department => {
+              const accessRights = department.accesses[resource];
+              return accessRights && accessRights[accessType];
+            });
+          }
+        }
+
+        req.accessResult = accessResult;
+        next();
+      } catch (err) {
+        console.error('Access control errorCode:', err);
+        return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
+      }
+    };
+  };
+
+  const handleAccessResult = (options = {}) => {
+    return (req, res, next) => {
+      const { accessResult } = req;
+      console.log('accesses is', accessResult);
+      if (!accessResult) {
+        return res.status(500).json({ errorCode: 'INTERNAL_ERROR' });
+      }
+
+      // Проверка аутентификации
+      if (!accessResult.isAuthenticated && !options.allowUnauthenticated) {
+        return res.status(401).json({ errorCode: 'UNAUTHORIZED' });
+      }
+
+      // Обработка различных сценариев доступа
+      if (accessResult.isAuthorized || accessResult.isPersonalOwner) {
+        // Пользователь авторизован или является личным владельцем, разрешаем доступ
+        return next();
+      } else if (options.allowPublished && req.method === 'GET') {
+        // Разрешаем доступ только к опубликованным ресурсам для GET-запросов
+        req.query.status = 'published';
+        return next();
+      } else if (options.customCheck && options.customCheck(accessResult, req)) {
+        // Пользовательская проверка доступа
+        return next();
+      }
+
+      // Если ни одно из условий не выполнено, отказываем в доступе
+      return res.status(403).json({ errorCode: 'ACCESS_DENIED' });
+    };
+  };
+
+  return {
+    verifyAccess,
+    handleAccessResult
+  };
+};
+
+module.exports = middlewareFactory;

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

@@ -1,3 +1,5 @@
+const accessesSchema = require('./schemas/accesses.schema.js');
+
 module.exports = (mongoose) => {
   // Схема отдела
   const departmentSchema = new mongoose.Schema({
@@ -27,106 +29,7 @@ module.exports = (mongoose) => {
       default: false,
     },
 
-    accesses: {
-      members: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      posts: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      gallery: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      leftovers: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      products: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      orders: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        confirm: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-      departments: {
-        read: {
-          type: Boolean,
-          default: false,
-        },
-        edit: {
-          type: Boolean,
-          default: false,
-        },
-        delete: {
-          type: Boolean,
-          default: false,
-        },
-      },
-    },
+    accesses: accessesSchema,
 
     // Marketplace options
     delivery: [String],

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

@@ -1,5 +1,8 @@
 const applyEngagementSchema = require('@pf/src/modules/globals/models/schemas/engagement.schema.js');
 
+const accessesSchema = require('./schemas/accesses.schema.js');
+
+
 module.exports = (db) => {
   const OrganizationSchema = new db.mongoose.Schema({
     // Creator and owner of organizations
@@ -17,6 +20,9 @@ module.exports = (db) => {
       type: Array,
       required: true,
     },
+    
+    accesses: accessesSchema,
+
     // Information for profile
     profile: {
       photo: String,
@@ -44,10 +50,6 @@ module.exports = (db) => {
       instagram: String,
       youtube: String
     },
-    // departments 
-    structure: {
-      type: [Object],
-    },
     // Computed Rating
     rating: {
       popularity: {

package/src/modules/organizations/models/schemas/accesses.schema.js

@@ -0,0 +1,142 @@
+const accessesSchema = {
+  members: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  posts: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  events: {
+    create: {
+      type: Boolean,
+      default: false,
+    },
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  tickets: {
+    create: {
+      type: Boolean,
+      default: false,
+    },
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  gallery: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    create: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  leftovers: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  products: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  orders: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    confirm: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  departments: {
+    read: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    delete: {
+      type: Boolean,
+      default: false,
+    },
+  },
+};
+
+module.exports = accessesSchema;

package/src/modules/organizations/router/organizations.js

@@ -4,6 +4,7 @@ import membersRoutes from './members.router.js';
 import departmentRoutes from './departments.router.js'
 
 import productRoutes from '@pf/src/modules/products/router/products.router.js'
+import eventsRoutes from '@pf/src/modules/events/router/events';
 import categoriesRoutes from '@pf/src/modules/products/router/categories.router.js'
 import leftoversRoutes from '@pf/src/modules/products/router/leftovers.router.js'
 
@@ -66,6 +67,7 @@ const organizations = [{
       ...membersRoutes,
       ...departmentRoutes,
       ...productRoutes,
+      ...eventsRoutes,
       ...categoriesRoutes,
       ...leftoversRoutes,
       ...paymentsRoutes,

package/src/modules/organizations/store/departments.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({
   departments: [],
@@ -34,6 +29,11 @@ const state = reactive({
     // Accesses
     hidden: false,
     accesses: {
+      events: {
+        read: false,
+        edit: false,
+        delete: false,
+      },
       gallery: {
         read: false,
         edit: false,

package/src/modules/organizations/store/organizations.js

@@ -1,12 +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}) 
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // State
 const state = reactive({
   all: [],
@@ -98,18 +95,7 @@ const actions = {
       .delete(`/api/organizations/${organizationId}/delete`)
       .then(
         (response) => {
-           state.error = null;
-
-           // Получить текущую куку
-          let cookieValue = Cookies.get('user');
-          let cookieObject = JSON.parse(cookieValue);
-
-          // Изменить значение нужного поля
-          cookieObject.organization = null
-          // cookieObject.accessToken = response.data
-
-          // Установить обновленную куку
-          Cookies.set('user', JSON.stringify(cookieObject),{ expires: 7, domain: '.osi.plus', sameSite: 'none', secure: true });
+          state.error = null;
           return Promise.resolve(response.data);
         },
         (error) => {

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

@@ -1,15 +1,12 @@
-import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue';
 import Sidebar from '@pf/src/modules/backoffice/components/partials/Sidebar.vue'
 
 import SidebarPages from '../components/partials/SidebarPages.vue'
 
 const pages = {
   path: 'pages',
-  component: layoutEmpty,
   meta: {
     title: {
       en: 'Pages',
-      ru: 'Информация'
     },
     sidebar: Sidebar
   },
@@ -23,24 +20,25 @@ const pages = {
     meta: {
       title: {
         en: 'New Page',
-        ru: 'Новая страница'
       },
       sidebar: SidebarPages
     },
-    component: () => import(/* webpackChunkName: 'PageAdd' */ '../components/pages/PageEdit.vue')
+    component: () => import(/* webpackChunkName: 'Pages' */ '../components/pages/PageEdit.vue')
   },{
     path: ':url+',
     name: 'Backoffice Pages Edit',
     meta: {
       title: {
         en: 'Edit Page',
-        ru: 'Редактировать страницу'
       },
       sidebar: SidebarPages
     },
-    component: () => import(/* webpackChunkName: 'PAgeEdit' */ '../components/pages/PageEdit.vue')
+    component: () => import(/* webpackChunkName: 'Pages' */ '../components/pages/PageEdit.vue')
   }]
 }
 
 export default pages;
 
+
+
+

package/src/modules/products/components/blocks/CardProduct.vue

@@ -37,6 +37,7 @@
 
 		<!-- Product Image Sqaure -->
 
+
 		<div 
 			class="o-hidden w-100 pos-relative aspect-1x1"
 			:class="
@@ -58,6 +59,7 @@
 				v-else
 				class="pos-absolute h-100 w-100"
 			/>
+			<span v-if="product.quantity <= 0" class="pos-absolute bg-light t-black pd-thin radius-big p-small t-medium pos-t-medium pos-l-medium">Out of Stock</span>
 			<THC v-if="product.information?.length > 0 && product.information[1]?.name === 'THC'" :product="product" />
 		</div>