@ozdao/prometheus-framework 0.2.221 → 0.2.223

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>
 

package/src/modules/products/components/pages/Product.vue

@@ -50,7 +50,7 @@
 	};
 
 	onMounted(async ()=> {
-		await products.actions.fetchProduct(route.params.product);
+		await products.actions.read({_id: route.params.product});
 
 	})
 	

package/src/modules/products/components/sections/MenuSection.vue

@@ -11,7 +11,7 @@
 
 			<ul v-else class="gap-thin grid-container">
 				<router-link :to="getMarketplaceLink([category.url])"
-					v-for="(category,index) in store.categories.state.all" 
+					v-for="(category,index) in store.categories.state.all.slice(0,5)" 
 					:key="category" 
 					class="cursor-pointer hover-scale-0 flex-v-center flex-h-center flex-nowrap flex-row flex bg-light radius-big pd-medium grid-item"
 				>
@@ -65,7 +65,7 @@
 
 <script setup>
 	import { ref, onMounted,computed } from 'vue'
-		import Loader from '@pf/src/components/Loader/Loader.vue'
+	import Loader from '@pf/src/components/Loader/Loader.vue'
 
 	import { useRouter } from 'vue-router'
 	import { useStore } from '@/store';