@ozdao/prometheus-framework 0.2.56 → 0.2.58

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

@@ -76,60 +76,6 @@ const backofficeRoutes = [{
       authorize: []
     },
     component: () => import(/* webpackChunkName: 'BackofficeCommunity' */ '@pf/src/modules/community/components/pages/Community.vue'),
-  },{
-    path: 'products',
-    name: 'Backoffice Products',
-    meta: {
-      title: {
-        en: 'Backoffice Products',
-        ru: 'Управление Продуктами'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeProducts' */ '@pf/src/modules/products/components/pages/ProductsBackoffice.vue'),
-  },{
-    path: 'products/add',
-    name: 'Backoffice AddProduct',
-    component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-  },{
-    path: 'products/:product',
-    name: 'Backoffice ProductEdit',
-    beforeEnter: [validationAuth.requiresAuth],
-    component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-  },{
-    path: 'leftovers',
-    name: 'Backoffice Leftovers',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeLeftovers' */ '@pf/src/modules/products/components/pages/Leftovers.vue'),
-},{
-    path: 'leftovers/add',
-    name: 'Backoffice LeftoverAdd',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers Add',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-  },
-  {
-    path: 'leftovers/:leftover',
-    name: 'Backoffice LeftoverEdit',
-    meta: {
-      title: {
-        en: 'Backoffice Leftovers Edit',
-        ru: 'Управление Остатками'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
   },
   {
     path: 'orders',
@@ -141,15 +87,26 @@ const backofficeRoutes = [{
       },
       authorize: []
     },
-    component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/Orders.vue'),
-  },{
-    path: 'orders/add',
-    name: 'AdminOrder',
-    component: () => import(/* webpackChunkName: 'AdminOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
-  },{
-    path: 'orders/:order',
-    name: 'AdminOrderEdit',
-    component: () => import(/* webpackChunkName: 'AdminOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    children: [{
+      path: '',
+      name: 'Backoffice Orders',
+      meta: {
+        title: {
+          en: 'Backoffice Orders',
+          ru: 'Управление Заказами'
+        },
+        authorize: []
+      },
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/Orders.vue'),
+    },{
+      path: 'add',
+      name: 'AdminOrderAdd',
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    },{
+      path: ':order',
+      name: 'AdminOrderEdit',
+      component: () => import(/* webpackChunkName: 'BackofficeOrders' */ '@pf/src/modules/orders/components/pages/EditOrder.vue')
+    }]
   },{
     path: 'payments',
     name: 'Backoffice Payments',

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

@@ -25,8 +25,14 @@
 </template>
 <script setup>
 import { ref, onMounted, computed,reactive } from 'vue'
+
+import Field from "@pf/src/components/Field/Field.vue";
+import Select from "@pf/src/components/Select/Select.vue";
+import Button from "@pf/src/components/Button/Button.vue";
+import Upload from "@pf/src/components/Upload/Upload.vue";
+
 import CardBlogpost  from '@pf/src/modules/community/components/blocks/CardBlogpost.vue'
-import { Button, Field, Select, Upload } from '@ozdao/prometheus-framework'
+
 import { 
   state as blogState, 
   read as fetchBlogPosts, 

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

@@ -55,7 +55,7 @@
 
 	import { ref, onMounted } from 'vue';
 
-	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'	
+	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
 
 	const props = defineProps({
 		content: {

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

@@ -32,7 +32,7 @@
 <script setup>
 	import { useI18n } from 'vue-i18n'
 
-	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'
+	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
 
 	const props = defineProps({
 		content: {

package/src/modules/events/store/events.js

@@ -103,6 +103,7 @@ async function read(options = {}) {
     console.log('Request params:' + options.params)
     const response = await $axios.get('/api/events/read', { params: options.params });
     console.log(options.params)
+    
     if (options.url) {
       set(response.data, 'current')
     } else {

package/src/modules/landing/components/pages/Home.vue

@@ -37,9 +37,8 @@
 	// Not working
 	import JoinUs 		from '@pf/src/modules/community/components/sections/JoinUs.vue'
 	import SubscribeNewsletter 		from '@pf/src/modules/applications/components/sections/SubscribeNewsletter.vue'
-	import HeroSection 			from '@pf/src/modules/landing/components/sections/HeroSection.vue'
-	import AboutSection 			from '@pf/src/modules/landing/components/sections/AboutSection.vue'
-	import HowItWorksSection  			from '@pf/src/modules/landing/components/sections/HowItWorksSection.vue'
+	// import HeroSection 			from '@pf/src/modules/landing/components/sections/HeroSection.vue'
+	// import HowItWorksSection  			from '@pf/src/modules/landing/components/sections/HowItWorksSection.vue'
 	import MapSection 			from '@pf/src/modules/landing/components/sections/MapSection.vue'
 
  	import Footer from '@pf/src/components/Footer/Footer.vue'

package/src/modules/orders/components/pages/FormOrder.vue

@@ -85,7 +85,7 @@
 			<!-- Send order -->
 		  <button 
 		  	v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"
-		    :disabled="
+		   	:disabled="
 		      errorName 
 		      || errorPhoneOrMessenger 
 		      || errorCity 
@@ -148,6 +148,8 @@ const cartTotalPrice = computed(() => shopcart.getters.cartTotalPrice)
 // Organization
 const orderOrganization = ref([])
 
+import Radio from '@pf/src/components/Radio/Radio.vue'
+
 onMounted(async()=> {
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
@@ -197,7 +199,18 @@ const errorPayment = computed(() => {
 async function handleCreate() {
 
 	orders.state.current.status = 'created';
-	
+	orders.state.current.delivery.type = 'courier'
+
+	orders.state.current.owner = {
+		target: orderOrganization.value._id,
+		type: 'organization'
+	}
+
+	orders.state.current.creator = {
+		target: auth.state.user._id,
+		type: 'user'
+	}
+
   let order = await orders.actions.create(shopcart.state.positions, shopcart.state.organization);
 
   if (order) {

package/src/modules/orders/components/pages/Order.vue

@@ -231,36 +231,39 @@
 	const orderOrganization = ref(null)
 
 	onMounted(async()=>{
-		order.value = await orders.actions.fetchOrder(route.params.order)
+		order.value = await orders.actions.read({_id: route.params.order})
 
 		productsOrganization.value = await products.actions.read({
-	    organization: order.value.organization
+	    organization: order.value[0].owner.target
 	  });
 
 	  orderOrganization.value = await organizations.actions.read({
-	    _id: order.value.organization,
+	    _id: order.value[0].owner.target,
 	    // location: globals.state.position?.location,
 	  });
 
 	})
 
 	let cartTotalPrice = computed(() => {
-    return Number(order.value.positions.reduce((total, product) => {
+    return Number(order.value[0]?.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
     }, 0));
   })
 
   let cartTotalAmount = computed(() => {
-    return Number(order.value.positions.reduce((total, product) => {
+    return Number(order.value[0]?.positions.reduce((total, product) => {
       return total + product.quantity;
     }, 0));
   })
 
   let orderProducts = computed(() => {
-    return order.value.positions.map(({ _id, quantity }) => {
+    return order.value[0]?.positions.map(({ _id, quantity }) => {
 
 	    const product = productsOrganization.value.find(product => product._id === _id)
 
+	    console.log(product)
+	    console.log(productOrganization)
+
 	    return {
 	      name: product.name,
 	      images: product.images,
@@ -271,16 +274,6 @@
 	  })
   })
 
-	onMounted(async () => {
-		
-  })
-
-	// await store.dispatch('payments/getStatus', props.order._id)
-
-	// const payment = computed(() => store.state.payments.current)
-
-	
-
 	function requestPayment(order) {
 		 // store.dispatch("payments/newPayment", order);
 	}

package/src/modules/orders/components/pages/Orders.vue

@@ -4,7 +4,7 @@
 
     <button 
       @click="$router.push({
-        name: 'AdminOrder'
+        name: 'AdminOrderAdd'
       })" 
       class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
         +

package/src/modules/orders/components/sections/FormClientDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <Block title="Personal Data" class="mn-b-thin">
     <Field 
-      v-model="order.client.name"     
+      v-model:field="order.client.name"     
       label="Name*"    
       placeholder="Enter your name"  
       class="bg-white pd-medium radius-small mn-b-thin"
@@ -43,7 +43,7 @@
       />
 
       <Field 
-        v-model="order.client.messenger.value"     
+        v-model:field="order.client.messenger.value"     
         placeholder="Enter your contact here"  
         class="bg-white pd-medium radius-small w-100"
       />

package/src/modules/orders/components/sections/FormDelivery.vue

@@ -1,14 +1,16 @@
 <template>
   <Block title="Delivery" class="mn-b-thin" :tooltip="'Delivery by mail takes 3-5 days.'">
+
     <div class="mn-b-small flex-nowrap flex">
+
       <Radio 
-        v-model="order.delivery.type"
+        v-model:radio="order.delivery.type"
         label="Courier"
         value="courier"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
       />
       <Radio 
-        v-model="order.delivery.type"
+        v-model:radio="order.delivery.type"
         label="Post"
         value="Post"
         class="bg-white pd-medium radius-small w-100 mn-r-small"
@@ -44,7 +46,7 @@
     />
 
     <Field 
-      v-model="order.comment"     
+      v-model:field="order.comment"     
       placeholder="Comments regarding the address (apartment unit, floor level, building section)"
       type="textarea"  
       class="bg-white pd-medium radius-small"

package/src/modules/orders/components/sections/FormPayment.vue

@@ -2,7 +2,7 @@
   <Block title="Payment">
     <div class="mn-b-small flex-nowrap flex">
       <Select 
-        v-model="order.payment.type"
+        v-model:select="order.payment.type"
         :property="'value'"
         :options="[
           {name: 'Cash On Delivery',  value: 'cash'}, 

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

@@ -39,7 +39,7 @@ const controllerFactory = (db) => {
     });
 
     try {
-      const formattedMessage = formatOrderMessage(req.body);
+      // const formattedMessage = formatOrderMessage(req.body);
       console.log(formattedMessage)
       const messageSent = await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","),formattedMessage)
     } catch (err) {  

package/src/modules/orders/models/order.model.js

@@ -72,7 +72,7 @@ module.exports = (db) => {
     }
   });
 
-  applyOwnershipSchema(OrderSchema,db);
+  // applyOwnershipSchema(OrderSchema,db);
 
   const Order = db.mongoose.model("Order", OrderSchema);
 

package/src/modules/orders/router/orders.router.js

@@ -33,7 +33,7 @@ const orders = [
     },
     {
       path: ':order/edit',
-      name: 'AdminOrderEdit',
+      name: 'Order Edit',
       meta: {
         title: {
           en: 'Order',

package/src/modules/orders/routes/orders.routes.js

@@ -22,11 +22,13 @@ module.exports = function(app, db) {
     "/api/orders/create",
     controller.create
   );
-    // Get orders
+  
+  // Get orders
   app.get(
     "/api/orders/read",
     controller.read
   );
+
   app.post(
     "/api/orders/update",
     [
@@ -34,6 +36,7 @@ module.exports = function(app, db) {
     ],
     controller.update
   );
+  
   app.post(
     "/api/orders/delete",
     controller.deleteOrder
@@ -44,6 +47,5 @@ module.exports = function(app, db) {
   //   "/api/orders/payment/:_id",
   //   controller.changePaymentStatus
   // );
-
 };
 

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

@@ -67,24 +67,20 @@ const actions = {
     }
   },
 
-   async fetchOrder(orderID) {
+   async read( options = {}) {
     try {
-      const response = await $axios.get(`/api/orders/${orderID}`);
-
-      state.current = response.data;
-      console.log(response.data)
-      return response.data; 
-    } catch (error) {
-      setError(error);
-      throw err;
-    }
-  },
+     
+      if (options._id) {
+        options.params = { _id: options._id };
+      }
 
-   async read(orderID) {
-    try {
-      const response = await $axios.get(`/api/orders/read`);
+      const response = await $axios.get('/api/orders/read', { params: options.params });
 
-      state.all = response.data;
+      if (options._id) {
+        set(response.data[0], 'current')
+      } else {
+        set(response.data, 'all')
+      }
 
       return response.data; 
     } catch (err) {
@@ -131,6 +127,10 @@ const actions = {
   },
 }
 
+function set(eventData, property) { 
+  state[property] = eventData
+}
+
 const history = []
 
 history.push(state) 

package/src/modules/organizations/components/blocks/EditArray.vue

@@ -22,8 +22,6 @@
 
 
 <script setup="props">
-  import VueSelect from "vue-select";
-
     // GLOBAL
   // import InputText    from '/components/elements/InputText.vue'
   // import InputSelect  from '/components/elements/InputSelect.vue'
@@ -128,7 +126,7 @@
 </script>
 
 <style lang="scss" >
-  @import "vue-select/dist/vue-select.css";
+  
 .VueSelect {
   background: #f7f7f7;
   border-radius: 0.5rem;

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

@@ -295,5 +295,4 @@ function redirectDash() {
 </script>
 
 <style scoped>
-  @import "vue-select/dist/vue-select.css";
 </style>

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

@@ -1,7 +1,7 @@
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
 const departmentRoutes = [{
-  path: ':_id/departments/create',
+  path: 'departments/create',
   name: 'Department Creation',
   meta: {
     title: 'Создание отдела',
@@ -9,7 +9,7 @@ const departmentRoutes = [{
   beforeEnter: [validationAuth.requiresAuth],
   component: () => import('@pf/src/modules/organizations/components/pages/DepartmentEdit.vue'),
 }, {
-  path: ':_id/departments/:department',
+  path: 'departments/:department',
   name: 'Department',
   meta: {
     title: 'Отдел',
@@ -17,7 +17,7 @@ const departmentRoutes = [{
   beforeEnter: [validationAuth.requiresAuth],
   component: () => import('@pf/src/modules/organizations/components/pages/Department.vue'),
 }, {
-  path: ':_id/departments/:department/edit',
+  path: 'departments/:department/edit',
   name: 'Department Edit',
   meta: {
     title: 'Редактирование отдела',

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

@@ -1,7 +1,7 @@
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-export const membersRoutes = [{
-  path: ':_id/members',
+const membersRoutes = [{
+  path: 'members',
   name: 'Organization Members',
   meta: {
     title: {
@@ -11,7 +11,10 @@ export const membersRoutes = [{
   },
   component: () => import('@pf/src/modules/organizations/components/pages/Members.vue')
 },{
-  path: ':_id/members/invite',
+  path: 'members/invite',
   name: 'Invite Member',
   component: () => import('@pf/src/modules/organizations/components/sections/MembersAdd.vue')
 }];
+
+
+export default membersRoutes;

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

@@ -1,13 +1,16 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
 
-import organizationRoutes from './organizations.router.js';
-
-import { membersRoutes } from './members.router.js';
+import membersRoutes from './members.router.js';
 import departmentRoutes from './departments.router.js'
-import productRoutes from './products.router.js';
+
+import productRoutes from '@pf/src/modules/products/router/products.router.js'
+import categoriesRoutes from '@pf/src/modules/products/router/categories.router.js'
+import leftoversRoutes from '@pf/src/modules/products/router/leftovers.router.js'
 
 import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
 
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
 const organizations = [{
   path: 'organizations',
   component: layoutEmpty,
@@ -17,14 +20,58 @@ const organizations = [{
       ru: 'Организации'
     }
   },
-  children: [
-    ...organizationRoutes,
-    ...membersRoutes,
-    ...departmentRoutes,
-    ...productRoutes,
-    // ...backofficeRoutes
-    
-  ]
+  children: [{
+    path: 'create',
+    name: 'Create Organization',
+    meta: {
+      title: {
+        en: 'Create Organization',
+        ru: 'Создать Организацию'
+      }
+    },
+    beforeEnter: [validationAuth.requiresAuth],
+    component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue')
+  },{
+    path: ':_id',
+    name: 'OrganizationRoot',
+    meta: {
+      title: {
+        en: 'Organization',
+        ru: 'Организация'
+      }
+    },
+    component: layoutEmpty,
+    children: [
+      {
+        path: '',
+        name: 'Organization',
+        meta: {
+          title: {
+            en: 'Organization',
+            ru: 'Организация'
+          }
+        },
+        component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
+      },
+      ...membersRoutes,
+      ...departmentRoutes,
+      ...productRoutes,
+      ...categoriesRoutes,
+      ...leftoversRoutes,
+      ...backofficeRoutes 
+    ],
+  },{
+    path: ':_id/edit',
+    name: 'Organization Edit',
+    meta: {
+      title: {
+        en: 'Edit Organization',
+        ru: 'Редактировать Организацию'
+      }
+    },
+    beforeEnter: [validationAuth.requiresAuth],
+    component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue'),
+  }]
 }];
 
 export default organizations;