@ozdao/prometheus-framework 0.1.36 → 0.1.38

package/src/modules/products/store/leftovers.js

@@ -15,84 +15,81 @@ const state = reactive({
 });
 
 const actions = {
-  async fetchAll() {
-    return await $axios.get(`/leftovers`).then(
-      (response) => {
-        state.all = response.data;
-        return Promise.resolve(response.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+  async read(options) {
+    try {
+      const response = await $axios.get('/leftovers');
+      state.all = response.data;
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
   },
 
   async fetch(_id) {
-    return await $axios.get(`/leftovers/` + _id).then(
-      (leftover) => {
-        state.current = leftover.data;
-        return Promise.resolve(leftover.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+    try {
+      const response = await $axios.get('/leftovers/' + _id);
+      state.current = response.data;
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
   },
 
   async create({ type, order, positions }) {
-    return await $axios.post(`/leftovers`, { type, order, positions }).then(
-      (response) => {
-        state.all.push(response.data);
-        return Promise.resolve(response.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+    try {
+      const response = await $axios.post('/leftovers', { type, order, positions });
+      state.all.push(response.data);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
   },
 
   async update(leftover) {
-    return await $axios.post(`/leftovers/` + leftover._id, leftover).then(
-      (leftover) => {
-        state.current = leftover.data;
-        return Promise.resolve(leftover.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+    try {
+      const response = await $axios.post('/leftovers/' + leftover._id, leftover);
+      state.current = response.data;
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
   },
 
   async delete(_id) {
-    return await $axios.delete(`/leftovers/` + _id).then(
-      (response) => {
-        state.all.splice(state.all.findIndex((l) => l._id == _id), 1);
-        return Promise.resolve(response.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+    try {
+      const response = await $axios.delete('/leftovers/' + _id);
+      state.all.splice(state.all.findIndex((l) => l._id == _id), 1);
+      return response.data;
+    } catch (error) {
+      setError(error);
+      throw error;
+    }
   },
 
-  addProductToLeftover(product) {
-    const cartItem = state.current.positions.find((item) => item._id === product._id);
-    if (!cartItem) {
-      state.current.positions.push(product);
+  // In your Vuex store
+  addProductToLeftover({ product, price, quantity, type }) {
+    const existingProduct = state.current.positions.find(item => item._id === product._id);
+
+    if (!existingProduct) {
+      state.current.positions.push({ ...product, price, quantity, type });
     } else {
-      cartItem.quantity++;
+      existingProduct.quantity += quantity;
+      existingProduct.price = price;
+      existingProduct.type = type
     }
   },
 
-  deleteItemFromLeftover(leftoverItem) {
-    var index = state.current.positions.findIndex((c) => c._id == leftoverItem._id);
-    state.current.positions.splice(index, 1);
+  deleteItemFromLeftover(product) {
+    const index = state.current.positions.findIndex(c => c._id === product._id);
+    if (index !== -1) {
+      state.current.positions.splice(index, 1);
+    }
   },
+
 };
 
 const history = [];

package/src/modules/products/store/products.js

@@ -55,36 +55,42 @@ const actions = {
   },
 
   async read(options = {}) {
+    // query.params = options.params || {};
+    
+    let query = { params: {}}
+
     // Handle fetching a specific post by _id
     if (options._id) {
-      options.params = { _id: options._id };
+      query.params._id = options._id ;
     }
 
     // Handle fetching posts by category
     if (options.category) {
-      options.params = options.params || {};
-      options.params.category = options.category;
+      query.params.category = options.category;
     }
-
-    // Handle pagination
-    options.params = options.params || {};
-    options.params.skip = options.skip || 0;
-    options.params.limit = options.limit || 10;
+  
+    query.params.skip = options.skip || 0;
+    query.params.limit = options.limit || 10;
 
     if (options.organization) {
-      options.params.organization = options.organization;
+      query.params.organization = options.organization;
     }
 
-    options.params.sort = 'createdAt';
+    console.log(options)
+     if (options.status) {
+      query.params.status = options.status;
+    }
+
+    query.params.sort = 'createdAt';
     
+    console.log(query)
     try {
-      console.log('Request params:' + options.params)
-      const response = await $axios.get('/products/read', { params: options.params });
+      const response = await $axios.get('/products/read', { params: query.params });
       
        if (options._id) {
-        state.current = response.data[0]; // Assuming that the response.data is the organization object
+        state.current = response.data[0]; 
       } else {
-        state.all = response.data; // Assuming that the response.data is an array of organization objects
+        state.all = response.data;
       }
       return Promise.resolve(response.data);
     } catch (error) {
@@ -133,16 +139,9 @@ const actions = {
   },
   
   async fetchProducts() {
-    return await $axios.get(`/products`).then(
+    return await $axios.get(`/products/read`).then(
       products => {
         state.all = products.data;
-        state.filtered = products.data.slice();
-        state.filteredPrice = state.filtered;
-
-        state.filteredPrice.sort(function (l, r) {
-          return l[state.sort.current] > r[state.sort.current] ? (state.sort.ascending ? 1 : -1) : l[state.sort.current] < r[state.sort.current] ? (state.sort.ascending ? -1 : 1) : 0;
-        });
-
         return Promise.resolve(products.data);
       },
       error => {

package/src/modules/spots/components/blocks/CardSpot.vue

@@ -0,0 +1,104 @@
+<template>
+  <div class="radius-big o-hidden cols-2-1_3">
+    <Map :location="{lat: spot.location.coordinates[1] ,lng: spot.location.coordinates[0]}" class=""/>
+
+    <div class="pd-medium w-100">
+     <svg  @click="$router.push(`/organizations/${props.organization._id}/spots/${spot._id}/edit`)" class="i-regular pos-absolute pos-r-0 pos-t-0 t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="black"/>
+      </svg>
+      
+      <h3 
+        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
+        class="mn-small w-100"
+        v-html="spot.profile.name"
+      />
+
+       <p 
+        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
+        class="mn-small p-big w-100"
+        v-html="spot.address"
+      />
+    
+      <Spoiler 
+        class="
+          radius-small 
+          o-hidden
+          br-1px br-solid br-grey 
+          mn-thin
+        "
+        >
+        <template #header>
+          <div class="pd-small flex-v-center flex-nowrap flex">
+            <h5 class="w-100" >Contacts </h5>
+            <p class="mn-r-small">{{spot.members.length}}&nbsp;человек</p>
+            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
+            </svg>
+
+          </div>
+        </template>
+        <template #content>
+           <ul>
+            <li v-if="spot.members.length < 1">В отделе еще нет участников</li>
+            <User 
+              class="br-b br-solid br-grey" 
+              v-for="(member, index) in spot.members" 
+              :key="index" 
+              :user="member.user" 
+              :position="member.position" 
+              @click="$router.push(`/app/profile/${member.user._id}`)" 
+            />
+          </ul>
+        </template>
+      </Spoiler>
+
+      <Spoiler 
+        class="
+          radius-small 
+          o-hidden
+          br-1px br-solid br-grey 
+          mn-thin
+        "
+        >
+        <template #header>
+          <div class="pd-small flex-v-center flex-nowrap flex">
+            <h5 class="w-100" >Working Hours </h5>
+            <p class="mn-r-small">{{spot.subspots ? spot.subspots.length : 0}}&nbsp;отделов</p>
+            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
+            </svg>
+
+          </div>
+        </template>
+        <template #content>
+          <ul>
+            <li v-if="spot.subspots.length < 1">В отделе еще нет подотделов</li>
+            <SpotSub  v-for="(subspotsartment, index) in spot.subspots" @click="$router.push(`/app/organization/spots/${subspotsartment._id}`)" :key="index" class="br-b br-solid br-grey" :spot="subspotsartment" />
+          </ul>
+        </template>
+      </Spoiler>
+
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
+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';
+
+const props = defineProps({
+  spot: Object,
+  organization: Object
+});
+</script>
+<style scoped>
+.subspotsartment {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  margin-top: 1rem;
+}
+</style>

package/src/modules/spots/components/blocks/SpotMemberModify.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <div class="br-grey radius-small mn-small">
+      <VueSelect 
+        v-if="props.spot === null"
+        v-model="spotForm.subspot"
+        :options="filteredSpots"
+        :get-option-label='option => option.name' 
+        class="w-100 mn-small"
+      /> 
+      <div v-else class="pd-small br-grey br-1px br-solid">
+        {{ spotForm.name ? spotForm.name : 'Безымянный' }}
+      </div>
+    </div>
+
+    <button :disabled="!spotForm.subspot" v-if="props.spot === null" @click="submitForm" class="w-100 button bg-second t-white">
+      Добавить отдел
+    </button>
+
+    <button v-if="props.spot !== null" @click="removeMember" class="w-100 button bg-fourth t-white">
+      Удалить отдел
+    </button> 
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from "vue";
+import VueSelect from "vue-select";
+import Field from "@pf/src/components/Field/Field.vue";
+import Select from "@pf/src/components/Select/Select.vue";
+const props = defineProps({
+  isPopupOpen: Boolean,
+  spot: Number,
+  spots: Array,
+  mainspot: Object,
+  allspots: Array,
+});
+
+const emits = defineEmits(['callback', 'remove']);
+
+const spotForm = ref({
+  subspot: null,
+});
+
+if (props.spot !== null) {
+  spotForm.value = props.spots[props.spot];
+}
+
+function filterSpots(allSpots, spots, editingSpot) {
+  return allSpots.filter((spot) => {
+    if (spots.some((dept) => dept._id === spot._id)) {
+      return false;
+    }
+    if (editingSpot._id === spot._id) {
+      return false;
+    }
+    return true;
+  });
+}
+
+const filteredSpots = computed(() => {
+  return filterSpots(props.allspots, props.spots, props.mainspot);
+});
+
+async function submitForm() {
+  props.spots.push(spotForm.value.subspot);
+  emits("callback");
+}
+
+async function removeMember() {
+  props.spots.splice(props.spot, 1);
+  emits("callback");
+}
+</script>
+
+<style scoped>
+.form-group {
+  margin-bottom: 1rem;
+}
+
+label {
+  display: block;
+  margin-bottom: 0.5rem;
+}
+
+input {
+  width: 100%;
+  padding: 0.5rem;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+</style>

package/src/modules/spots/components/blocks/SpotSub.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="pd-small flex-nowrap flex">
+    <!-- <img :src="(FILE_SERVER_URL || '') + avatar" :alt="`${name} avatar`" class="user-card__avatar" /> -->
+    <div class="user-card__info">
+      <p class="user-card__name">{{ department.name ? department.name : 'Безымянный' }}</p>
+      <p class="user-card__position">{{ department.members ? department.members.length : '0' }} человек</p>
+      <!-- Render other properties here -->
+    </div>
+  </div>
+</template>
+
+<script setup>
+  const props = defineProps({
+    department: {
+      type: Object,
+      required: true
+    },
+    // Define other props here
+  });
+</script>
+
+<style scoped>
+  /* Add styles for the user card component here */
+</style>

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

@@ -357,8 +357,8 @@ onMounted(async () => {
 
     // Add new markers
     markers.value = data.map(org => {
-      // Get the first department's location
-      let location = org.departments[0]?.location;
+      // Get the first spot's location
+      let location = org.spots[0]?.location;
       if (location && location.type === 'Point') {
         let [lng, lat] = location.coordinates; // Note that coordinates are in [lng, lat] format
         

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

@@ -0,0 +1,107 @@
+<template>
+  <div class="radius-big o-hidden cols-2-1_3">
+    <Map :location="{lat: spot.location.coordinates[1] ,lng: spot.location.coordinates[0]}" class=""/>
+
+    <div class="pd-medium w-100">
+     <svg  @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}/edit`)" class="i-regular pos-absolute pos-r-0 pos-t-0 t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="black"/>
+      </svg>
+      
+      <h3 
+        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
+        class="mn-small w-100"
+        v-html="spot.profile.name"
+      />
+
+       <p 
+        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
+        class="mn-small p-big w-100"
+        v-html="spot.address"
+      />
+
+      
+    
+      <Spoiler 
+        class="
+          radius-small 
+          o-hidden
+          br-1px br-solid br-grey 
+          mn-thin
+        "
+        >
+        <template #header>
+          <div class="pd-small flex-v-center flex-nowrap flex">
+            <h5 class="w-100" >Contacts </h5>
+            <p class="mn-r-small">{{spot.members.length}}&nbsp;человек</p>
+            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
+            </svg>
+
+          </div>
+        </template>
+        <template #content>
+           <ul>
+            <li v-if="spot.members.length < 1">В отделе еще нет участников</li>
+            <User 
+              class="br-b br-solid br-grey" 
+              v-for="(member, index) in spot.members" 
+              :key="index" 
+              :user="member.user" 
+              :position="member.position" 
+              @click="$router.push(`/app/profile/${member.user._id}`)" 
+            />
+          </ul>
+        </template>
+      </Spoiler>
+
+      <Spoiler 
+        class="
+          radius-small 
+          o-hidden
+          br-1px br-solid br-grey 
+          mn-thin
+        "
+        >
+        <template #header>
+          <div class="pd-small flex-v-center flex-nowrap flex">
+            <h5 class="w-100" >Working Hours </h5>
+            <p class="mn-r-small">{{spot.subspots ? spot.subspots.length : 0}}&nbsp;отделов</p>
+            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
+            </svg>
+
+          </div>
+        </template>
+        <template #content>
+          <ul>
+            <li v-if="spot.subspots.length < 1">В отделе еще нет подотделов</li>
+            <SpotSub  v-for="(subspotsartment, index) in spot.subspots" @click="$router.push(`/app/organization/spots/${subspotsartment._id}`)" :key="index" class="br-b br-solid br-grey" :spot="subspotsartment" />
+          </ul>
+        </template>
+      </Spoiler>
+
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
+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';
+
+const props = defineProps({
+  spot: Object,
+  organization: Object
+});
+</script>
+<style scoped>
+.subspotsartment {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  margin-top: 1rem;
+}
+</style>