@ozdao/prometheus-framework 0.2.81 → 0.2.82

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

@@ -1,49 +1,46 @@
-module.exports = (mongoose) => {
-  const defaultRole = {
-    name: 'Сотрудник',
-    value: 'member'
-  };
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+const applyCredentialsSchema = require('@pf/src/modules/globals/models/credentials.schema.js');
 
-  const InviteSchema = new mongoose.Schema({
+module.exports = (db) => {
+  const InviteSchema = new db.mongoose.Schema({
     code: { 
       type: String, 
       required: true, 
       unique: true 
     },
-    organization: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Organization',
-      required: true,
-    },
     status: { 
       type: String, 
-      enum: ['active', 'used'], 
+      enum: ['active', 'used', 'deactivated'], 
       default: 'active' 
     },
-    role: {
-      name: {
-        type: String,
-        default: 'Сотрудник'
-      },
-      value: {
-        type: String,
-        default: 'member'
-      }
-    },
-    createdBy: { 
-      type: mongoose.Schema.Types.ObjectId, ref: 'User' 
-    },
-    invitedEmail: { 
-      type: String 
-    },
-    invitedPhone: { 
-      type: String 
-    },
   }, { 
     timestamps: true 
   });
 
-  const Invite = mongoose.model('Invite', InviteSchema);
+  applyOwnershipSchema(InviteSchema, db);
+  applyCredentialsSchema(InviteSchema, db);
+
+  InviteSchema.index({
+    owner: 1,
+    email: 1
+  }, {
+    unique: true,
+    partialFilterExpression: {
+      email: { $exists: true, $ne: "" }  
+    }
+  });
+
+  InviteSchema.index({
+    owner: 1,
+    phone: 1
+  }, {
+    unique: true,
+    partialFilterExpression: {
+      phone: { $exists: true, $ne: "" } 
+    }
+  });
+
+  const Invite = db.mongoose.model('Invite', InviteSchema);
 
   return Invite;
 }

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

@@ -27,6 +27,8 @@ module.exports = (mongoose) => {
       },
       required: true,
     }
+  }, { 
+    timestamps: true 
   });
 
   const Membership = mongoose.model('Membership', MembershipSchema);

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

@@ -62,8 +62,9 @@ module.exports = (mongoose) => {
       },
       amount: Number,
     },
+  }, { 
+    timestamps: true 
   });
-
   // const Testimonial = require('./testimonial.model');
 
   // OrganizationSchema.methods.calculateRating = async function() {

package/src/modules/organizations/organizations.client.js

@@ -7,7 +7,6 @@ import DepartmentEdit from './components/pages/DepartmentEdit.vue';
 
 import CardOrganization from './components/blocks/CardOrganization.vue';
 import EditArray from './components/blocks/EditArray.vue';
-import User from './components/blocks/User.vue';
 import Unit from './components/blocks/Unit.vue';
 import DepartmentSub from './components/blocks/DepartmentSub.vue';
 import DepartmentMemberModify from './components/blocks/DepartmentMemberModify.vue';
@@ -44,7 +43,6 @@ Organizations,
 DepartmentEdit,
 CardOrganization,
 EditArray,
-User,
 Unit,
 DepartmentSub,
 DepartmentMemberModify,

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

@@ -1,20 +1,31 @@
 // Factories
-const controllerFactory = require("../controllers/departments.controller");
+const controllerFactory = require("../controllers/departments.controller")
+// Middlewares
+const accessMiddlewaresFactory = require('@pf/src/modules/middlewares/server/verifyAccesses')
+
 // Routes
 module.exports = function(app, db) {
-  const controller = controllerFactory(db);
+  const controller = controllerFactory(db)
+  const verifyAccesses = accessMiddlewaresFactory(db)
 
   app.use(function(req, res, next) {
     res.header(
       "Access-Control-Allow-Headers",
       "Access-Control-Allow-Origin",
       "x-access-token, Origin, Content-Type, Accept"
-    );
-    next();
-  });
+    )
+
+    next()
+  })
 
   // Get organization departments by _id
-  app.get("/api/departments/read", controller.read);
+  app.get(
+    "/api/departments/read",
+    // [
+    //   verifyAccesses('read', 'departments'),
+    // ],
+    controller.read
+  );
 
   // Get department by _id
   app.get("/api/departments/get/:_id", controller.readOne);
@@ -28,4 +39,4 @@ module.exports = function(app, db) {
   // Delete organization department
   app.delete("/api/departments/:_id/delete", controller.delete);
 
-};
+};

package/src/modules/organizations/routes/invites.routes.js

@@ -28,7 +28,7 @@ module.exports = function(app, db) {
   );
     // Create invite in organization
   app.post(
-    "/api/invites/:_id/create",
+    "/api/invites/create",
     [
       verifyInvites.checkInviteExist, 
       verifyInvites.checkUsersExist
@@ -37,7 +37,7 @@ module.exports = function(app, db) {
   );
   // Delete invite in organization
   app.delete(
-    "/api/invites/:_id/delete",
+    "/api/invites/delete/:_id",
     controller.delete
   );
 };

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

@@ -30,6 +30,26 @@ const state = reactive({
     payment: [],
     members: [],
     subdepartments: [],
+
+    // Accesses
+    hidden: false,
+    accesses: {
+      products: {
+        read: false,
+        edit: false,
+        delete: false,
+      },
+      orders: {
+        read: false,
+        confirm: false, // This property was added based on the schema
+        delete: false,
+      },
+      departments: {
+        read: false,
+        edit: false,
+        delete: false,
+      },
+    }
   },
   error: null,
 });
@@ -48,7 +68,7 @@ const actions = {
     }
   },
 
-  async read(options) {
+  async read(options = {}) {
     try {
       const response = await $axios.get(`/api/departments/read`, { params: options });
 
@@ -57,6 +77,7 @@ const actions = {
       state.error = null;
       return response.data; // Return the response data
     } catch (error) {
+      console.log(error)
       setError(error);
       return null; // Return null or appropriate error response
     }

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

@@ -1,94 +1,78 @@
-// 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/store/globals'
-// State
-import * as auth from '../../../modules/auth/store/auth'
-// Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
-// Setup Cookies
-$axios.defaults.withCredentials = true
-// State
-const state = reactive({
-  invites: [],
-  invite: null,
-  error: null,
-});
-// Methods
-const actions = {
-  async read(organizationId) {
-    await $axios
-      .get(`/api/invites/${organizationId}`)
-      .then(response => {
-        state.invites = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async readOne(inviteId) {
-
-    await $axios
-      .get(`/api/invites/get/${inviteId}`) // Измените URL, чтобы использовать inviteId
-      .then(response => {
-        state.invite = response.data; // Используйте отдельное свойство для хранения одного инвайта
-
-        auth.state.user.phone = response.data.invitedPhone
-        auth.state.user.email = response.data.invitedEmail
-
-      })
-      .catch(error => {
-        setError(error);
-      });
-  },
-  async create(organizationId, invite) {
-    console.log(invite)
-    await $axios
-      .post(`/api/invites/${organizationId}/create`, invite)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async update(organizationId, membership) {
-    await $axios
-      .put(`/api/invites/${organizationId}/update`, membership)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async delete(inviteID) {
-    await $axios
-      .delete(`/api/invites/${inviteID}/delete`)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
+// Dependencies  
+import axios from 'axios';  
+// Vue modules  
+import { reactive, watch } from "vue";  
+// Globals   
+import { setError } from '@pf/src/modules/globals/store/globals'  
+// State  
+import * as auth from '@pf/src/modules/auth/store/auth'  
+// Setup Axios  
+const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });  
+// State  
+const state = reactive({  
+  invites: [],  
+  invite: null,  
+  error: null,  
+});  
+// Methods  
+const actions = {  
+  async read(options) {  
+    try {
+      const response = await $axios.get(`/api/invites/${options.owner}`);
+      state.invites = response.data;  
+      state.error = null;  
+      return response.data;
+    } catch (error) {
+      setError(error);
+    }
+  },  
+  async readOne(inviteId) {  
+    try {
+      const response = await $axios.get(`/api/invites/get/${inviteId}`);
+      state.invite = response.data;
+      auth.state.user.phone = response.data.phone;  
+      auth.state.user.email = response.data.email;
+    } catch (error) {
+      setError(error);
+    }
+  },  
+  async create(invites) {  
+    try {
+      await $axios.post(`/api/invites/create`, invites);
+      state.error = null;
+    } catch (error) {
+      setError(error);
+    }
+  },  
+  async update(organizationId, membership) {  
+    try {
+      await $axios.put(`/api/invites/update`, membership);
+      state.error = null;
+    } catch (error) {
+      setError(error);
+    }
+  },  
+  async delete(inviteID) {  
+    try {
+      await $axios.delete(`/api/invites/delete/${inviteID}`);
+      state.error = null;
+    } catch (error) {
+      setError(error);
+    }
+  },  
 };
 
-// // History
-const history = []
-history.push(state) 
+// History  
+const history = []  
+history.push(state);
 
-// // Watch
-watch(state, (newState, oldState) => {
-  history.push(newState)
-})
+// Watch  
+watch(state, (newState, oldState) => {  
+  history.push(newState);  
+});
 
-// Module Export
-export {
-  state,
-  actions,
-}
+// Module Export  
+export {  
+  state,  
+  actions,  
+};

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

@@ -4,6 +4,7 @@
 			radius-big 
 			cols-1
 			o-hidden
+			pos-relative
 		"
 		:class="
 			product.information[2] 
@@ -13,6 +14,27 @@
 		"
 	>
 
+		<router-link 
+        :to="{
+          name: 'ProductEdit', 
+          params: {
+            _id: $route.params.organization,
+            product: product._id
+          }
+        }" 
+        class="
+        	z-index-2
+          cursor-pointer 
+          pos-absolute pos-t-regular pos-r-regular
+          radius-extra pd-thin bg-second
+        "
+      >
+        <IconEdit
+          class="i-regular"
+          classes="fill-white"
+        />
+      </router-link>
+
 		<!-- Product Image Sqaure -->
 
 		<div 
@@ -92,6 +114,8 @@
 	import {computed } from 'vue'
 	import { useI18n }    from 'vue-i18n'
 
+	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+
 	import THC from '@pf/src/modules/products/components/elements/THC.vue'
 	import Price from '@pf/src/modules/products/components/elements/Price.vue'
 

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

@@ -69,7 +69,7 @@
           :key="product._id"
           :product="product"
           class="h-max"
-          @click="$router.push({
+          @click.capture="$router.push({
             name: 'Product Organization', 
             params: { 
               _id: route.params._id, 

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

@@ -4,47 +4,47 @@
 		@click.native="openReportPopup()"
 	>
 		<slot></slot>
-	</div>
 
-	<Popup 
-	  @close-popup="closeReportPopup" 
-	  :isPopupOpen="isReportPopup"
-	  class="w-m-33r t-left pd-big bg-white radius-big"
-	>
-	    <h3 
-	    	class="mn-b-small"
-	    >
-			Report Content
-		</h3>
-	    
-	    <p 
-	    	class="p-medium mn-b-small"
-	    >
-	    	We strive to maintain a safe and comfortable environment for all users. If you encounter content that you believe violates our guidelines, please report it:
-	    </p>
-	    <Select 
-			v-model:select="form.reason" 
-	        :options="[
-	        	'harassment',
-	        	'spam',
-	        	'inappropriate',
-	        	'misinformation',
-	        	'copyright',
-	        	'other'
-	        ]"
-	        :placeholder="'Select reason'"
-			class="mn-b-small bg-white br-solid br-black-transp br-1px uppercase pd-medium t-semi bg-white t-black radius-medium"
-	      />
-	    
-	    <p class="p-medium mn-b-small">Our moderators will review your report within 24 hours and take action if it violates our policies.</p>
-	    
-	    <Button 
-	    	:submit="onSubmit" 
-	    	:callback="closeReportPopup" 
-	    	class="w-100 bg-black t-white">
-	    	Report
-	    </Button>
-	</Popup>
+		<Popup 
+		  @close-popup="closeReportPopup" 
+		  :isPopupOpen="isReportPopup"
+		  class="w-m-33r t-left pd-big bg-white radius-big"
+		>
+		    <h3 
+		    	class="mn-b-small"
+		    >
+				Report Content
+			</h3>
+		    
+		    <p 
+		    	class="p-medium mn-b-small"
+		    >
+		    	We strive to maintain a safe and comfortable environment for all users. If you encounter content that you believe violates our guidelines, please report it:
+		    </p>
+		    <Select 
+				v-model:select="form.reason" 
+		        :options="[
+		        	'harassment',
+		        	'spam',
+		        	'inappropriate',
+		        	'misinformation',
+		        	'copyright',
+		        	'other'
+		        ]"
+		        :placeholder="'Select reason'"
+				class="mn-b-small bg-white br-solid br-black-transp br-1px uppercase pd-medium t-semi bg-white t-black radius-medium"
+		      />
+		    
+		    <p class="p-medium mn-b-small">Our moderators will review your report within 24 hours and take action if it violates our policies.</p>
+		    
+		    <Button 
+		    	:submit="onSubmit" 
+		    	:callback="closeReportPopup" 
+		    	class="w-100 bg-black t-white">
+		    	Report
+		    </Button>
+		</Popup>
+	</div>
 </template>
 
 <script setup="props">

package/src/modules/spots/components/pages/Spot.vue

@@ -92,7 +92,7 @@ import Map      from '@pf/src/components/Map/Map.vue';
 
 
 import SpotSub from '@pf/src/modules/spots/components/blocks/SpotSub.vue';
-import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
 const props = defineProps({
   spot: Object,

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -169,7 +169,7 @@ import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray
 import SpotSub from "@pf/src/modules/spots/components/blocks/SpotSub.vue";
 import SpotMemberModify from "@pf/src/modules/spots/components/blocks/SpotMemberModify.vue";
 // import SpotSubSpotModify from "@pf/src/modules/spots/components/blocks/SpotSubSpotModify.vue";
-import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 
 import * as spots from "@pf/src/modules/spots/store/spots";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";

package/src/modules/users/components/blocks/CardUser.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="flex-v-center flex-nowrap flex">
+    <img 
+      v-if="photo" 
+      :src="(FILE_SERVER_URL || '') + photo" 
+      class="radius-medium bg-white object-fit-cover mn-r-thin i-thin" 
+
+      @click.stop="$router.push({
+        name: user.type === 'user' ? 'User Profile' : 'Organization', 
+        params: {
+          _id: user._id
+        }
+      })" 
+    />
+
+    <PlaceholderUserpic
+      v-if="!photo"
+      class="radius-medium mn-r-thin i-thin"
+
+      @click.stop="$router.push({
+        name: 'User Profile', 
+        params: {
+          _id: user._id || _id
+        }
+      })" 
+    />
+
+    <div>
+      <p class="h4">{{ name }}</p>
+      <span class=" mn-r-small">{{phone || email}}</span>
+    </div>
+
+    <div v-if="action || role" class="mn-l-auto  flex-v-center flex">
+      <span 
+        class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
+      >
+        {{role}}
+      </span>
+      <button 
+        v-if="action" 
+        @click.stop="action.method" 
+        class="h-100 w-2r t-white mn-l-thin capitalize t-medium radius-big bg-red"
+        >
+          {{action.label}}
+        </button>
+      <!-- {{`Member since  ${user.createdAt}. Invited by ${user.creator.target}`}} -->
+    </div>
+ 
+  </div>
+</template>
+
+<script setup>
+  import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
+
+  const props = defineProps({
+    _id: {
+      type: String,
+      default: null
+    },
+    user: {
+      type: Object,
+      required: true
+    },
+    action: {
+      type: Object,
+    },
+    photo: {
+      type: String,
+      default: null
+    },
+    name: {
+      type: String,
+      default: 'No name'
+    },
+    role: {
+      type: String
+    },
+    phone: {
+      type: String,
+    },
+    email: {
+      type: String,
+    }
+  });
+</script>