@ozdao/martyrs 0.2.428 → 0.2.429

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.cjs

@@ -7,12 +7,13 @@ const Chips = require("../../../../components/Chips/Chips.vue.cjs");
 const Map = require("../../../../components/Map/Map.vue.cjs");
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.cjs");
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };
-const _hoisted_2 = { class: "pd-medium w-100" };
-const _hoisted_3 = { class: "pd-thin bg-light radius-small mn-b-thin p-small w-max" };
-const _hoisted_4 = ["innerHTML"];
-const _hoisted_5 = { class: "d-block p-big mn-b-semi" };
-const _hoisted_6 = { key: 2 };
-const _hoisted_7 = { key: 4 };
+const _hoisted_2 = { class: "pd-small w-100" };
+const _hoisted_3 = { class: "bg-light radius-small pd-thin mn-b-thin radius-small" };
+const _hoisted_4 = { class: "p-small w-100 t-truncate" };
+const _hoisted_5 = ["innerHTML"];
+const _hoisted_6 = { class: "d-block p-big mn-b-semi" };
+const _hoisted_7 = { key: 2 };
+const _hoisted_8 = { key: 4 };
 const _sfc_main = {
   __name: "CardSpot",
   props: {
@@ -53,18 +54,20 @@ const _sfc_main = {
             fill: "rgb(var(--white))",
             class: "z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi"
           })) : vue.createCommentVNode("", true),
-          vue.createElementVNode("p", _hoisted_3, vue.toDisplayString(__props.spot.address), 1),
+          vue.createElementVNode("div", _hoisted_3, [
+            vue.createElementVNode("p", _hoisted_4, vue.toDisplayString(__props.spot.address), 1)
+          ]),
           vue.createElementVNode("h3", {
             class: "mn-b-thin w-100",
             innerHTML: __props.spot.profile.name
-          }, null, 8, _hoisted_4),
-          vue.createElementVNode("p", _hoisted_5, vue.toDisplayString(__props.spot.profile.description), 1),
-          __props.showDeliveryOptions ? (vue.openBlock(), vue.createElementBlock("h4", _hoisted_6, "Delivery:")) : vue.createCommentVNode("", true),
+          }, null, 8, _hoisted_5),
+          vue.createElementVNode("p", _hoisted_6, vue.toDisplayString(__props.spot.profile.description), 1),
+          __props.showDeliveryOptions ? (vue.openBlock(), vue.createElementBlock("h4", _hoisted_7, "Delivery:")) : vue.createCommentVNode("", true),
           __props.showDeliveryOptions && __props.spot.delivery.length > 0 ? (vue.openBlock(), vue.createBlock(Chips.default, {
             key: 3,
             chips: __props.spot.delivery
           }, null, 8, ["chips"])) : vue.createCommentVNode("", true),
-          __props.showPaymentOptions ? (vue.openBlock(), vue.createElementBlock("h4", _hoisted_7, "Accepted Payment:")) : vue.createCommentVNode("", true),
+          __props.showPaymentOptions ? (vue.openBlock(), vue.createElementBlock("h4", _hoisted_8, "Accepted Payment:")) : vue.createCommentVNode("", true),
           __props.showPaymentOptions && __props.spot.payment.length > 0 ? (vue.openBlock(), vue.createBlock(Chips.default, {
             key: 5,
             chips: __props.spot.payment
@@ -74,6 +77,6 @@ const _sfc_main = {
     };
   }
 };
-const CardSpot = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6f954e4d"]]);
+const CardSpot = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-be40b3c0"]]);
 exports.default = CardSpot;
 //# sourceMappingURL=CardSpot.vue.cjs.map

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CardSpot.vue.cjs","sources":["../../../../../../../src/modules/spots/components/blocks/CardSpot.vue"],"sourcesContent":["<template>\n  <div class=\"pos-relative cols-2-1_3\">\n    <Map \n      :apiKey=\"GOOGLE_MAPS_API_KEY\" \n      :location=\"{\n        lat: spot.location.coordinates[1],\n        lng: spot.location.coordinates[0]\n      }\" \n      :locale=\"$i18n.locale\"\n      class=\"aspect-1x1 h-100 w-auto\"\n    />\n\n    <div class=\"pd-medium w-100\">\n\n        <!-- v-if=\"user === event.creator.target._id\" -->\n      <IconEdit\n        v-if=\"editAccess\"\n        @click=\"$router.push({\n        name: 'Spot Edit',\n        params: {\n          _id: props.organization._id,\n          spot: spot._id\n        }\n      })\" \n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp\"\n      />\n\n      <IconCheckmark\n        v-if=\"selected\"\n        :fill=\"'rgb(var(--white))'\"\n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi\"\n      />\n   \n    \n      <p \n        class=\"pd-thin bg-light radius-small mn-b-thin p-small w-max\"\n      >\n        {{spot.address}}\n      </p>\n\n      <h3 \n        class=\"mn-b-thin w-100\"\n        v-html=\"spot.profile.name\"\n      />\n\n    \n\n      <p class=\"d-block p-big mn-b-semi\">{{spot.profile.description}}</p>\n\n      <h4 v-if=\"showDeliveryOptions\">Delivery:</h4>\n      <Chips \n        v-if=\"showDeliveryOptions && spot.delivery.length > 0\" \n        :chips=\"spot.delivery\"\n      />\n\n      <h4 v-if=\"showPaymentOptions\">Accepted Payment:</h4>\n      <Chips \n        v-if=\"showPaymentOptions && spot.payment.length > 0\" \n        :chips=\"spot.payment\"\n      />\n\n\n\n    </div>\n  </div>\n\n</template>\n\n<script setup>\nimport { ref } from 'vue';\n\nimport IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue';\n\nimport IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';\n\n\nimport Chips  from '@martyrs/src/components/Chips/Chips.vue';\nimport Map      from '@martyrs/src/components/Map/Map.vue';\n\nconst props = defineProps({\n  spot: Object,\n  organization: Object,\n  editAccess: Boolean,\n  showDeliveryOptions: Boolean,\n  showPaymentOptions: Boolean,\n  selected: Boolean\n});\n</script>\n<style scoped>\n.subspotsartment {\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  margin-top: 1rem;\n}\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA+EA,UAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"CardSpot.vue.cjs","sources":["../../../../../../../src/modules/spots/components/blocks/CardSpot.vue"],"sourcesContent":["<template>\n  <div class=\"pos-relative cols-2-1_3\">\n    <Map \n      :apiKey=\"GOOGLE_MAPS_API_KEY\" \n      :location=\"{\n        lat: spot.location.coordinates[1],\n        lng: spot.location.coordinates[0]\n      }\" \n      :locale=\"$i18n.locale\"\n      class=\"aspect-1x1 h-100 w-auto\"\n    />\n\n    <div class=\"pd-small w-100\">\n\n        <!-- v-if=\"user === event.creator.target._id\" -->\n      <IconEdit\n        v-if=\"editAccess\"\n        @click=\"$router.push({\n        name: 'Spot Edit',\n        params: {\n          _id: props.organization._id,\n          spot: spot._id\n        }\n      })\" \n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp\"\n      />\n\n      <IconCheckmark\n        v-if=\"selected\"\n        :fill=\"'rgb(var(--white))'\"\n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi\"\n      />\n   \n      <div class=\"bg-light radius-small pd-thin mn-b-thin radius-small\">\n        <p \n          class=\" p-small w-100 t-truncate\"\n        >\n          {{spot.address}}\n        </p>\n      </div>\n\n      <h3 \n        class=\"mn-b-thin w-100\"\n        v-html=\"spot.profile.name\"\n      />\n\n    \n\n      <p class=\"d-block p-big mn-b-semi\">{{spot.profile.description}}</p>\n\n      <h4 v-if=\"showDeliveryOptions\">Delivery:</h4>\n      <Chips \n        v-if=\"showDeliveryOptions && spot.delivery.length > 0\" \n        :chips=\"spot.delivery\"\n      />\n\n      <h4 v-if=\"showPaymentOptions\">Accepted Payment:</h4>\n      <Chips \n        v-if=\"showPaymentOptions && spot.payment.length > 0\" \n        :chips=\"spot.payment\"\n      />\n\n\n\n    </div>\n  </div>\n\n</template>\n\n<script setup>\nimport { ref } from 'vue';\n\nimport IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue';\n\nimport IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';\n\n\nimport Chips  from '@martyrs/src/components/Chips/Chips.vue';\nimport Map      from '@martyrs/src/components/Map/Map.vue';\n\nconst props = defineProps({\n  spot: Object,\n  organization: Object,\n  editAccess: Boolean,\n  showDeliveryOptions: Boolean,\n  showPaymentOptions: Boolean,\n  selected: Boolean\n});\n</script>\n<style scoped>\n.subspotsartment {\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  margin-top: 1rem;\n}\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAgFA,UAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.js

@@ -5,12 +5,13 @@ import _sfc_main$3 from "../../../../components/Chips/Chips.vue.js";
 import Map from "../../../../components/Map/Map.vue.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };
-const _hoisted_2 = { class: "pd-medium w-100" };
-const _hoisted_3 = { class: "pd-thin bg-light radius-small mn-b-thin p-small w-max" };
-const _hoisted_4 = ["innerHTML"];
-const _hoisted_5 = { class: "d-block p-big mn-b-semi" };
-const _hoisted_6 = { key: 2 };
-const _hoisted_7 = { key: 4 };
+const _hoisted_2 = { class: "pd-small w-100" };
+const _hoisted_3 = { class: "bg-light radius-small pd-thin mn-b-thin radius-small" };
+const _hoisted_4 = { class: "p-small w-100 t-truncate" };
+const _hoisted_5 = ["innerHTML"];
+const _hoisted_6 = { class: "d-block p-big mn-b-semi" };
+const _hoisted_7 = { key: 2 };
+const _hoisted_8 = { key: 4 };
 const _sfc_main = {
   __name: "CardSpot",
   props: {
@@ -51,18 +52,20 @@ const _sfc_main = {
             fill: "rgb(var(--white))",
             class: "z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi"
           })) : createCommentVNode("", true),
-          createElementVNode("p", _hoisted_3, toDisplayString(__props.spot.address), 1),
+          createElementVNode("div", _hoisted_3, [
+            createElementVNode("p", _hoisted_4, toDisplayString(__props.spot.address), 1)
+          ]),
           createElementVNode("h3", {
             class: "mn-b-thin w-100",
             innerHTML: __props.spot.profile.name
-          }, null, 8, _hoisted_4),
-          createElementVNode("p", _hoisted_5, toDisplayString(__props.spot.profile.description), 1),
-          __props.showDeliveryOptions ? (openBlock(), createElementBlock("h4", _hoisted_6, "Delivery:")) : createCommentVNode("", true),
+          }, null, 8, _hoisted_5),
+          createElementVNode("p", _hoisted_6, toDisplayString(__props.spot.profile.description), 1),
+          __props.showDeliveryOptions ? (openBlock(), createElementBlock("h4", _hoisted_7, "Delivery:")) : createCommentVNode("", true),
           __props.showDeliveryOptions && __props.spot.delivery.length > 0 ? (openBlock(), createBlock(_sfc_main$3, {
             key: 3,
             chips: __props.spot.delivery
           }, null, 8, ["chips"])) : createCommentVNode("", true),
-          __props.showPaymentOptions ? (openBlock(), createElementBlock("h4", _hoisted_7, "Accepted Payment:")) : createCommentVNode("", true),
+          __props.showPaymentOptions ? (openBlock(), createElementBlock("h4", _hoisted_8, "Accepted Payment:")) : createCommentVNode("", true),
           __props.showPaymentOptions && __props.spot.payment.length > 0 ? (openBlock(), createBlock(_sfc_main$3, {
             key: 5,
             chips: __props.spot.payment
@@ -72,7 +75,7 @@ const _sfc_main = {
     };
   }
 };
-const CardSpot = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6f954e4d"]]);
+const CardSpot = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-be40b3c0"]]);
 export {
   CardSpot as default
 };

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardSpot.vue.js","sources":["../../../../../../../src/modules/spots/components/blocks/CardSpot.vue"],"sourcesContent":["<template>\n  <div class=\"pos-relative cols-2-1_3\">\n    <Map \n      :apiKey=\"GOOGLE_MAPS_API_KEY\" \n      :location=\"{\n        lat: spot.location.coordinates[1],\n        lng: spot.location.coordinates[0]\n      }\" \n      :locale=\"$i18n.locale\"\n      class=\"aspect-1x1 h-100 w-auto\"\n    />\n\n    <div class=\"pd-medium w-100\">\n\n        <!-- v-if=\"user === event.creator.target._id\" -->\n      <IconEdit\n        v-if=\"editAccess\"\n        @click=\"$router.push({\n        name: 'Spot Edit',\n        params: {\n          _id: props.organization._id,\n          spot: spot._id\n        }\n      })\" \n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp\"\n      />\n\n      <IconCheckmark\n        v-if=\"selected\"\n        :fill=\"'rgb(var(--white))'\"\n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi\"\n      />\n   \n    \n      <p \n        class=\"pd-thin bg-light radius-small mn-b-thin p-small w-max\"\n      >\n        {{spot.address}}\n      </p>\n\n      <h3 \n        class=\"mn-b-thin w-100\"\n        v-html=\"spot.profile.name\"\n      />\n\n    \n\n      <p class=\"d-block p-big mn-b-semi\">{{spot.profile.description}}</p>\n\n      <h4 v-if=\"showDeliveryOptions\">Delivery:</h4>\n      <Chips \n        v-if=\"showDeliveryOptions && spot.delivery.length > 0\" \n        :chips=\"spot.delivery\"\n      />\n\n      <h4 v-if=\"showPaymentOptions\">Accepted Payment:</h4>\n      <Chips \n        v-if=\"showPaymentOptions && spot.payment.length > 0\" \n        :chips=\"spot.payment\"\n      />\n\n\n\n    </div>\n  </div>\n\n</template>\n\n<script setup>\nimport { ref } from 'vue';\n\nimport IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue';\n\nimport IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';\n\n\nimport Chips  from '@martyrs/src/components/Chips/Chips.vue';\nimport Map      from '@martyrs/src/components/Map/Map.vue';\n\nconst props = defineProps({\n  spot: Object,\n  organization: Object,\n  editAccess: Boolean,\n  showDeliveryOptions: Boolean,\n  showPaymentOptions: Boolean,\n  selected: Boolean\n});\n</script>\n<style scoped>\n.subspotsartment {\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  margin-top: 1rem;\n}\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AA+EA,UAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"CardSpot.vue.js","sources":["../../../../../../../src/modules/spots/components/blocks/CardSpot.vue"],"sourcesContent":["<template>\n  <div class=\"pos-relative cols-2-1_3\">\n    <Map \n      :apiKey=\"GOOGLE_MAPS_API_KEY\" \n      :location=\"{\n        lat: spot.location.coordinates[1],\n        lng: spot.location.coordinates[0]\n      }\" \n      :locale=\"$i18n.locale\"\n      class=\"aspect-1x1 h-100 w-auto\"\n    />\n\n    <div class=\"pd-small w-100\">\n\n        <!-- v-if=\"user === event.creator.target._id\" -->\n      <IconEdit\n        v-if=\"editAccess\"\n        @click=\"$router.push({\n        name: 'Spot Edit',\n        params: {\n          _id: props.organization._id,\n          spot: spot._id\n        }\n      })\" \n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp\"\n      />\n\n      <IconCheckmark\n        v-if=\"selected\"\n        :fill=\"'rgb(var(--white))'\"\n        class=\"z-index-2 pos-absolute pos-t-regular pos-r-regular radius-extra bg-second pd-thin i-semi\"\n      />\n   \n      <div class=\"bg-light radius-small pd-thin mn-b-thin radius-small\">\n        <p \n          class=\" p-small w-100 t-truncate\"\n        >\n          {{spot.address}}\n        </p>\n      </div>\n\n      <h3 \n        class=\"mn-b-thin w-100\"\n        v-html=\"spot.profile.name\"\n      />\n\n    \n\n      <p class=\"d-block p-big mn-b-semi\">{{spot.profile.description}}</p>\n\n      <h4 v-if=\"showDeliveryOptions\">Delivery:</h4>\n      <Chips \n        v-if=\"showDeliveryOptions && spot.delivery.length > 0\" \n        :chips=\"spot.delivery\"\n      />\n\n      <h4 v-if=\"showPaymentOptions\">Accepted Payment:</h4>\n      <Chips \n        v-if=\"showPaymentOptions && spot.payment.length > 0\" \n        :chips=\"spot.payment\"\n      />\n\n\n\n    </div>\n  </div>\n\n</template>\n\n<script setup>\nimport { ref } from 'vue';\n\nimport IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue';\n\nimport IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';\n\n\nimport Chips  from '@martyrs/src/components/Chips/Chips.vue';\nimport Map      from '@martyrs/src/components/Map/Map.vue';\n\nconst props = defineProps({\n  spot: Object,\n  organization: Object,\n  editAccess: Boolean,\n  showDeliveryOptions: Boolean,\n  showPaymentOptions: Boolean,\n  selected: Boolean\n});\n</script>\n<style scoped>\n.subspotsartment {\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  margin-top: 1rem;\n}\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAgFA,UAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/modules/spots/store/spots.cjs

@@ -38,11 +38,18 @@ const actions = {
       globals.setError(error);
     }
   },
-  async read(organizationId) {
+  async read(organization) {
     try {
-      const response = await axiosInstance.default.get(`/api/spots/${organizationId}`);
-      state.spots = response.data;
-      return response.data;
+      if (typeof arg === "string") {
+        const response = await axiosInstance.default.get(`/api/spots/${organization}`);
+        state.spots = response.data;
+        return response.data;
+      }
+      if (typeof organization === "object") {
+        const response = await axiosInstance.default.get(`/api/spots`, { organization });
+        state.spots = response.data;
+        return response.data;
+      }
     } catch (error) {
       globals.setError(error);
     }

package/dist/martyrs/src/modules/spots/store/spots.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"spots.cjs","sources":["../../../../../../src/modules/spots/store/spots.js"],"sourcesContent":["// Vue modules\nimport { reactive, watch  } from \"vue\";\n// Globals \nimport { setError }   from '@martyrs/src/modules/globals/views/store/globals'\n// Setup Axios\nimport $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';\n// State\nconst state = reactive({\n  spots: [],\n  spot: {\n    status: 'unpublished',\n    organization: '',\n\n    profile: {\n      photo: '',\n      name: '',\n      description: '',\n      categories: [],\n    },\n    position: {\n      address: undefined,\n      location: undefined,\n      hide: false\n    },\n\n    address: undefined,\n    location: undefined,\n\n    worktime: [],\n    delivery: [],\n    payment: [],\n    members: [],\n    subspots: [],\n  },\n  error: null,\n});\n\n// Methods\nconst actions = {\n  async readOne(spotID) {\n    try {\n      const response = await $axios.get(`/api/spots/get/${spotID}`);\n\n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async read(organizationId) {\n    try {\n      const response = await $axios.get(`/api/spots/${organizationId}`);\n\n      state.spots = response.data;\n      return response.data\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async create(organizationId, spot) {\n    try {\n      const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);\n      \n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async update(organizationId, spot) {\n    try {\n      await $axios.post(`/api/spots/${organizationId}/update`, spot);\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async delete(organizationId, spotId) {\n    try {\n      await $axios.delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } });\n    } catch (error) {\n      setError(error);\n    }\n  },\n};\n\n// History\nconst history = []\nhistory.push(state)\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState)\n})\n\n// Module Export\nexport {\n  state,\n  actions,\n}"],"names":["reactive","$axios","setError","watch"],"mappings":";;;;;AAOK,MAAC,QAAQA,IAAAA,SAAS;AAAA,EACrB,OAAO,CAAE;AAAA,EACT,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,cAAc;AAAA,IAEd,SAAS;AAAA,MACP,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,YAAY,CAAE;AAAA,IACf;AAAA,IACD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,MAAM;AAAA,IACP;AAAA,IAED,SAAS;AAAA,IACT,UAAU;AAAA,IAEV,UAAU,CAAE;AAAA,IACZ,UAAU,CAAE;AAAA,IACZ,SAAS,CAAE;AAAA,IACX,SAAS,CAAE;AAAA,IACX,UAAU,CAAE;AAAA,EACb;AAAA,EACD,OAAO;AACT,CAAC;AAGI,MAAC,UAAU;AAAA,EACd,MAAM,QAAQ,QAAQ;AACpB,QAAI;AACF,YAAM,WAAW,MAAMC,sBAAO,IAAI,kBAAkB,MAAM,EAAE;AAE5D,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,KAAK,gBAAgB;AACzB,QAAI;AACF,YAAM,WAAW,MAAMD,sBAAO,IAAI,cAAc,cAAc,EAAE;AAEhE,YAAM,QAAQ,SAAS;AACvB,aAAO,SAAS;AAAA,IACjB,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,WAAW,MAAMD,cAAAA,QAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAE9E,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAMD,cAAAA,QAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAAA,IAC9D,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,QAAQ;AACnC,QAAI;AACF,YAAMD,sBAAO,OAAO,cAAc,cAAc,WAAW,EAAE,MAAM,EAAE,KAAK,OAAQ,EAAA,CAAE;AAAA,IACrF,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AACH;AAOAC,IAAAA,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;;;"}
+{"version":3,"file":"spots.cjs","sources":["../../../../../../src/modules/spots/store/spots.js"],"sourcesContent":["// Vue modules\nimport { reactive, watch  } from \"vue\";\n// Globals \nimport { setError }   from '@martyrs/src/modules/globals/views/store/globals'\n// Setup Axios\nimport $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';\n// State\nconst state = reactive({\n  spots: [],\n  spot: {\n    status: 'unpublished',\n    organization: '',\n\n    profile: {\n      photo: '',\n      name: '',\n      description: '',\n      categories: [],\n    },\n    position: {\n      address: undefined,\n      location: undefined,\n      hide: false\n    },\n\n    address: undefined,\n    location: undefined,\n\n    worktime: [],\n    delivery: [],\n    payment: [],\n    members: [],\n    subspots: [],\n  },\n  error: null,\n});\n\n// Methods\nconst actions = {\n  async readOne(spotID) {\n    try {\n      const response = await $axios.get(`/api/spots/get/${spotID}`);\n\n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async read(organization) {\n    try {\n      if (typeof arg === 'string') {\n        const response = await $axios.get(`/api/spots/${organization}`);\n        state.spots = response.data;\n        return response.data;\n      }\n\n      if (typeof organization === 'object') {\n        const response = await $axios.get(`/api/spots`, { organization });\n        state.spots = response.data;\n        return response.data;\n      }\n    } catch (error) {\n      setError(error);\n    }\n  },\n\n  async create(organizationId, spot) {\n    try {\n      const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);\n      \n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async update(organizationId, spot) {\n    try {\n      await $axios.post(`/api/spots/${organizationId}/update`, spot);\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async delete(organizationId, spotId) {\n    try {\n      await $axios.delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } });\n    } catch (error) {\n      setError(error);\n    }\n  },\n};\n\n// History\nconst history = []\nhistory.push(state)\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState)\n})\n\n// Module Export\nexport {\n  state,\n  actions,\n}"],"names":["reactive","$axios","setError","watch"],"mappings":";;;;;AAOK,MAAC,QAAQA,IAAAA,SAAS;AAAA,EACrB,OAAO,CAAE;AAAA,EACT,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,cAAc;AAAA,IAEd,SAAS;AAAA,MACP,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,YAAY,CAAE;AAAA,IACf;AAAA,IACD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,MAAM;AAAA,IACP;AAAA,IAED,SAAS;AAAA,IACT,UAAU;AAAA,IAEV,UAAU,CAAE;AAAA,IACZ,UAAU,CAAE;AAAA,IACZ,SAAS,CAAE;AAAA,IACX,SAAS,CAAE;AAAA,IACX,UAAU,CAAE;AAAA,EACb;AAAA,EACD,OAAO;AACT,CAAC;AAGI,MAAC,UAAU;AAAA,EACd,MAAM,QAAQ,QAAQ;AACpB,QAAI;AACF,YAAM,WAAW,MAAMC,sBAAO,IAAI,kBAAkB,MAAM,EAAE;AAE5D,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,KAAK,cAAc;AACvB,QAAI;AACF,UAAI,OAAO,QAAQ,UAAU;AAC3B,cAAM,WAAW,MAAMD,sBAAO,IAAI,cAAc,YAAY,EAAE;AAC9D,cAAM,QAAQ,SAAS;AACvB,eAAO,SAAS;AAAA,MACxB;AAEM,UAAI,OAAO,iBAAiB,UAAU;AACpC,cAAM,WAAW,MAAMA,sBAAO,IAAI,cAAc,EAAE,cAAc;AAChE,cAAM,QAAQ,SAAS;AACvB,eAAO,SAAS;AAAA,MACxB;AAAA,IACK,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EAED,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,WAAW,MAAMD,cAAAA,QAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAE9E,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAMD,cAAAA,QAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAAA,IAC9D,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,QAAQ;AACnC,QAAI;AACF,YAAMD,sBAAO,OAAO,cAAc,cAAc,WAAW,EAAE,MAAM,EAAE,KAAK,OAAQ,EAAA,CAAE;AAAA,IACrF,SAAQ,OAAO;AACdC,cAAAA,SAAS,KAAK;AAAA,IACpB;AAAA,EACG;AACH;AAOAC,IAAAA,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;;;"}

package/dist/martyrs/src/modules/spots/store/spots.js

@@ -36,11 +36,18 @@ const actions = {
       setError(error);
     }
   },
-  async read(organizationId) {
+  async read(organization) {
     try {
-      const response = await $axios.get(`/api/spots/${organizationId}`);
-      state.spots = response.data;
-      return response.data;
+      if (typeof arg === "string") {
+        const response = await $axios.get(`/api/spots/${organization}`);
+        state.spots = response.data;
+        return response.data;
+      }
+      if (typeof organization === "object") {
+        const response = await $axios.get(`/api/spots`, { organization });
+        state.spots = response.data;
+        return response.data;
+      }
     } catch (error) {
       setError(error);
     }

package/dist/martyrs/src/modules/spots/store/spots.js.map

@@ -1 +1 @@
-{"version":3,"file":"spots.js","sources":["../../../../../../src/modules/spots/store/spots.js"],"sourcesContent":["// Vue modules\nimport { reactive, watch  } from \"vue\";\n// Globals \nimport { setError }   from '@martyrs/src/modules/globals/views/store/globals'\n// Setup Axios\nimport $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';\n// State\nconst state = reactive({\n  spots: [],\n  spot: {\n    status: 'unpublished',\n    organization: '',\n\n    profile: {\n      photo: '',\n      name: '',\n      description: '',\n      categories: [],\n    },\n    position: {\n      address: undefined,\n      location: undefined,\n      hide: false\n    },\n\n    address: undefined,\n    location: undefined,\n\n    worktime: [],\n    delivery: [],\n    payment: [],\n    members: [],\n    subspots: [],\n  },\n  error: null,\n});\n\n// Methods\nconst actions = {\n  async readOne(spotID) {\n    try {\n      const response = await $axios.get(`/api/spots/get/${spotID}`);\n\n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async read(organizationId) {\n    try {\n      const response = await $axios.get(`/api/spots/${organizationId}`);\n\n      state.spots = response.data;\n      return response.data\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async create(organizationId, spot) {\n    try {\n      const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);\n      \n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async update(organizationId, spot) {\n    try {\n      await $axios.post(`/api/spots/${organizationId}/update`, spot);\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async delete(organizationId, spotId) {\n    try {\n      await $axios.delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } });\n    } catch (error) {\n      setError(error);\n    }\n  },\n};\n\n// History\nconst history = []\nhistory.push(state)\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState)\n})\n\n// Module Export\nexport {\n  state,\n  actions,\n}"],"names":[],"mappings":";;;AAOK,MAAC,QAAQ,SAAS;AAAA,EACrB,OAAO,CAAE;AAAA,EACT,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,cAAc;AAAA,IAEd,SAAS;AAAA,MACP,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,YAAY,CAAE;AAAA,IACf;AAAA,IACD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,MAAM;AAAA,IACP;AAAA,IAED,SAAS;AAAA,IACT,UAAU;AAAA,IAEV,UAAU,CAAE;AAAA,IACZ,UAAU,CAAE;AAAA,IACZ,SAAS,CAAE;AAAA,IACX,SAAS,CAAE;AAAA,IACX,UAAU,CAAE;AAAA,EACb;AAAA,EACD,OAAO;AACT,CAAC;AAGI,MAAC,UAAU;AAAA,EACd,MAAM,QAAQ,QAAQ;AACpB,QAAI;AACF,YAAM,WAAW,MAAM,OAAO,IAAI,kBAAkB,MAAM,EAAE;AAE5D,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,KAAK,gBAAgB;AACzB,QAAI;AACF,YAAM,WAAW,MAAM,OAAO,IAAI,cAAc,cAAc,EAAE;AAEhE,YAAM,QAAQ,SAAS;AACvB,aAAO,SAAS;AAAA,IACjB,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,WAAW,MAAM,OAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAE9E,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,OAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAAA,IAC9D,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,QAAQ;AACnC,QAAI;AACF,YAAM,OAAO,OAAO,cAAc,cAAc,WAAW,EAAE,MAAM,EAAE,KAAK,OAAQ,EAAA,CAAE;AAAA,IACrF,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AACH;AAOA,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;"}
+{"version":3,"file":"spots.js","sources":["../../../../../../src/modules/spots/store/spots.js"],"sourcesContent":["// Vue modules\nimport { reactive, watch  } from \"vue\";\n// Globals \nimport { setError }   from '@martyrs/src/modules/globals/views/store/globals'\n// Setup Axios\nimport $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';\n// State\nconst state = reactive({\n  spots: [],\n  spot: {\n    status: 'unpublished',\n    organization: '',\n\n    profile: {\n      photo: '',\n      name: '',\n      description: '',\n      categories: [],\n    },\n    position: {\n      address: undefined,\n      location: undefined,\n      hide: false\n    },\n\n    address: undefined,\n    location: undefined,\n\n    worktime: [],\n    delivery: [],\n    payment: [],\n    members: [],\n    subspots: [],\n  },\n  error: null,\n});\n\n// Methods\nconst actions = {\n  async readOne(spotID) {\n    try {\n      const response = await $axios.get(`/api/spots/get/${spotID}`);\n\n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async read(organization) {\n    try {\n      if (typeof arg === 'string') {\n        const response = await $axios.get(`/api/spots/${organization}`);\n        state.spots = response.data;\n        return response.data;\n      }\n\n      if (typeof organization === 'object') {\n        const response = await $axios.get(`/api/spots`, { organization });\n        state.spots = response.data;\n        return response.data;\n      }\n    } catch (error) {\n      setError(error);\n    }\n  },\n\n  async create(organizationId, spot) {\n    try {\n      const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);\n      \n      state.spot = response.data;\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async update(organizationId, spot) {\n    try {\n      await $axios.post(`/api/spots/${organizationId}/update`, spot);\n    } catch (error) {\n      setError(error);\n    }\n  },\n  async delete(organizationId, spotId) {\n    try {\n      await $axios.delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } });\n    } catch (error) {\n      setError(error);\n    }\n  },\n};\n\n// History\nconst history = []\nhistory.push(state)\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState)\n})\n\n// Module Export\nexport {\n  state,\n  actions,\n}"],"names":[],"mappings":";;;AAOK,MAAC,QAAQ,SAAS;AAAA,EACrB,OAAO,CAAE;AAAA,EACT,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,cAAc;AAAA,IAEd,SAAS;AAAA,MACP,OAAO;AAAA,MACP,MAAM;AAAA,MACN,aAAa;AAAA,MACb,YAAY,CAAE;AAAA,IACf;AAAA,IACD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,MAAM;AAAA,IACP;AAAA,IAED,SAAS;AAAA,IACT,UAAU;AAAA,IAEV,UAAU,CAAE;AAAA,IACZ,UAAU,CAAE;AAAA,IACZ,SAAS,CAAE;AAAA,IACX,SAAS,CAAE;AAAA,IACX,UAAU,CAAE;AAAA,EACb;AAAA,EACD,OAAO;AACT,CAAC;AAGI,MAAC,UAAU;AAAA,EACd,MAAM,QAAQ,QAAQ;AACpB,QAAI;AACF,YAAM,WAAW,MAAM,OAAO,IAAI,kBAAkB,MAAM,EAAE;AAE5D,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,KAAK,cAAc;AACvB,QAAI;AACF,UAAI,OAAO,QAAQ,UAAU;AAC3B,cAAM,WAAW,MAAM,OAAO,IAAI,cAAc,YAAY,EAAE;AAC9D,cAAM,QAAQ,SAAS;AACvB,eAAO,SAAS;AAAA,MACxB;AAEM,UAAI,OAAO,iBAAiB,UAAU;AACpC,cAAM,WAAW,MAAM,OAAO,IAAI,cAAc,EAAE,cAAc;AAChE,cAAM,QAAQ,SAAS;AACvB,eAAO,SAAS;AAAA,MACxB;AAAA,IACK,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EAED,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,WAAW,MAAM,OAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAE9E,YAAM,OAAO,SAAS;AAAA,IACvB,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,MAAM;AACjC,QAAI;AACF,YAAM,OAAO,KAAK,cAAc,cAAc,WAAW,IAAI;AAAA,IAC9D,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AAAA,EACD,MAAM,OAAO,gBAAgB,QAAQ;AACnC,QAAI;AACF,YAAM,OAAO,OAAO,cAAc,cAAc,WAAW,EAAE,MAAM,EAAE,KAAK,OAAQ,EAAA,CAAE;AAAA,IACrF,SAAQ,OAAO;AACd,eAAS,KAAK;AAAA,IACpB;AAAA,EACG;AACH;AAOA,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;"}

package/dist/orders.server.js

@@ -475,6 +475,12 @@ ${formatPositions(order.positions)}
             comment: ""
           });
         }
+        if (req2.body.payment?.type && req2.body.payment.type !== order.payment?.type) {
+          order.payment.type = req2.body.payment.type;
+        }
+        if (req2.body.payment?.status && req2.body.payment.status !== order.payment?.status) {
+          order.payment.status = req2.body.payment.status;
+        }
         await order.save();
         if (statusChanged) {
           try {

package/dist/orders.server.mjs

@@ -474,6 +474,12 @@ ${formatPositions(order.positions)}
             comment: ""
           });
         }
+        if (req2.body.payment?.type && req2.body.payment.type !== order.payment?.type) {
+          order.payment.type = req2.body.payment.type;
+        }
+        if (req2.body.payment?.status && req2.body.payment.status !== order.payment?.status) {
+          order.payment.status = req2.body.payment.status;
+        }
         await order.save();
         if (statusChanged) {
           try {

package/dist/spots.server.js

@@ -1,5 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
+const queryProcessor = require("./queryProcessor-CwQakZkT.js");
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -81,8 +82,46 @@ var hasRequiredSpots_controller;
 function requireSpots_controller() {
   if (hasRequiredSpots_controller) return spots_controller;
   hasRequiredSpots_controller = 1;
+  const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
   const controllerFactory = (db) => {
     const Spot = db.spot;
+    const read = async (req, res) => {
+      let stages = [
+        ...queryProcessorGlobals.getBasicOptions(
+          req.query
+        ),
+        // Tags
+        ...queryProcessorGlobals.getTagsOptions(req.query.tags),
+        // For creator
+        queryProcessorGlobals.getCreatorUserLookupStage(),
+        queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+        queryProcessorGlobals.getCreatorCustomerLookupStage(),
+        // For owner
+        queryProcessorGlobals.getOwnerUserLookupStage(),
+        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+        queryProcessorGlobals.removeTempPropeties(),
+        // Pagination
+        ...queryProcessorGlobals.getSortingOptions(
+          req.query.sortParam,
+          req.query.sortOrder
+        ),
+        ...queryProcessorGlobals.getPaginationOptions(
+          req.query.skip,
+          req.query.limit
+        )
+      ];
+      try {
+        const spots = await Spots.aggregate(stages);
+        if (!stpos) {
+          return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
+        }
+        res.status(200).send(spos);
+      } catch (err) {
+        console.log(err);
+        res.status(500).send({ errorCode: "GET_SPOTS_FAILED", message: "Error occurred while fetching spots.", error: err });
+      }
+    };
     const readOne = (req, res) => {
       Spot.findOne({ _id: req.params._id }).then((spot) => {
         if (!spot) {
@@ -93,7 +132,7 @@ function requireSpots_controller() {
         res.status(500).send({ message: err.message });
       });
     };
-    const read = (req, res) => {
+    const readOld = (req, res) => {
       Spot.find({ organization: req.params._id }).then((spots) => {
         if (!spots) {
           return res.status(404).send({ message: "Spots not found" });
@@ -137,8 +176,9 @@ function requireSpots_controller() {
       });
     };
     return {
-      readOne,
       read,
+      readOne,
+      readOld,
       create,
       update,
       delete: deleteSpot
@@ -155,7 +195,8 @@ function requireSpots_routes() {
   const controllerFactory = requireSpots_controller();
   spots_routes = function(app, db) {
     const controller = controllerFactory(db);
-    app.get("/api/spots/:_id", controller.read);
+    app.get("/api/spots", controller.read);
+    app.get("/api/spots/:_id", controller.readOld);
     app.get("/api/spots/get/:_id", controller.readOne);
     app.post("/api/spots/:_id/create", controller.create);
     app.post("/api/spots/:_id/update", controller.update);

package/dist/spots.server.mjs

@@ -1,4 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -80,8 +81,46 @@ var hasRequiredSpots_controller;
 function requireSpots_controller() {
   if (hasRequiredSpots_controller) return spots_controller;
   hasRequiredSpots_controller = 1;
+  const queryProcessorGlobals = requireQueryProcessor();
   const controllerFactory = (db) => {
     const Spot = db.spot;
+    const read = async (req, res) => {
+      let stages = [
+        ...queryProcessorGlobals.getBasicOptions(
+          req.query
+        ),
+        // Tags
+        ...queryProcessorGlobals.getTagsOptions(req.query.tags),
+        // For creator
+        queryProcessorGlobals.getCreatorUserLookupStage(),
+        queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+        queryProcessorGlobals.getCreatorCustomerLookupStage(),
+        // For owner
+        queryProcessorGlobals.getOwnerUserLookupStage(),
+        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+        queryProcessorGlobals.removeTempPropeties(),
+        // Pagination
+        ...queryProcessorGlobals.getSortingOptions(
+          req.query.sortParam,
+          req.query.sortOrder
+        ),
+        ...queryProcessorGlobals.getPaginationOptions(
+          req.query.skip,
+          req.query.limit
+        )
+      ];
+      try {
+        const spots = await Spots.aggregate(stages);
+        if (!stpos) {
+          return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
+        }
+        res.status(200).send(spos);
+      } catch (err) {
+        console.log(err);
+        res.status(500).send({ errorCode: "GET_SPOTS_FAILED", message: "Error occurred while fetching spots.", error: err });
+      }
+    };
     const readOne = (req, res) => {
       Spot.findOne({ _id: req.params._id }).then((spot) => {
         if (!spot) {
@@ -92,7 +131,7 @@ function requireSpots_controller() {
         res.status(500).send({ message: err.message });
       });
     };
-    const read = (req, res) => {
+    const readOld = (req, res) => {
       Spot.find({ organization: req.params._id }).then((spots) => {
         if (!spots) {
           return res.status(404).send({ message: "Spots not found" });
@@ -136,8 +175,9 @@ function requireSpots_controller() {
       });
     };
     return {
-      readOne,
       read,
+      readOne,
+      readOld,
       create,
       update,
       delete: deleteSpot
@@ -154,7 +194,8 @@ function requireSpots_routes() {
   const controllerFactory = requireSpots_controller();
   spots_routes = function(app, db) {
     const controller = controllerFactory(db);
-    app.get("/api/spots/:_id", controller.read);
+    app.get("/api/spots", controller.read);
+    app.get("/api/spots/:_id", controller.readOld);
     app.get("/api/spots/get/:_id", controller.readOne);
     app.post("/api/spots/:_id/create", controller.create);
     app.post("/api/spots/:_id/update", controller.update);

package/dist/style.css

@@ -1277,21 +1277,21 @@ div.vue-tags-input.disabled * {
   margin-left: 0.5rem;
 }
 
-.notification-badge-container[data-v-31a828f9] {
+.notification-badge-container[data-v-73074f7a] {
   position: relative;
   display: inline-block;
 }
-.notification-button[data-v-31a828f9] {
+.notification-button[data-v-73074f7a] {
   background: none;
   border: none;
   cursor: pointer;
   position: relative;
   font-size: 1.2rem;
 }
-.notification-icon[data-v-31a828f9] {
+.notification-icon[data-v-73074f7a] {
   font-size: 1.4rem;
 }
-.button-counter[data-v-31a828f9] {
+.button-counter[data-v-73074f7a] {
   position: absolute;
   right: -8px;
   bottom: -8px;
@@ -1305,7 +1305,7 @@ div.vue-tags-input.disabled * {
   line-height: 16px;
   font-size: 10px;
 }
-.notifications-dropdown[data-v-31a828f9] {
+.notifications-dropdown[data-v-73074f7a] {
   position: absolute;
   top: 100%;
   right: 0;
@@ -1317,40 +1317,40 @@ div.vue-tags-input.disabled * {
   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
   z-index: 1000;
 }
-.notifications-header[data-v-31a828f9] {
+.notifications-header[data-v-73074f7a] {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 12px 16px;
   border-bottom: 1px solid #eee;
 }
-.notifications-header h3[data-v-31a828f9] {
+.notifications-header h3[data-v-73074f7a] {
   margin: 0;
   font-size: 1rem;
 }
-.mark-all-read-btn[data-v-31a828f9] {
+.mark-all-read-btn[data-v-73074f7a] {
   background: none;
   border: none;
   color: #2196f3;
   font-size: 0.8rem;
   cursor: pointer;
 }
-.notifications-loading[data-v-31a828f9],
-.notifications-empty[data-v-31a828f9] {
+.notifications-loading[data-v-73074f7a],
+.notifications-empty[data-v-73074f7a] {
   padding: 24px;
   text-align: center;
   color: #666;
 }
-.notifications-list[data-v-31a828f9] {
+.notifications-list[data-v-73074f7a] {
   max-height: 300px;
   overflow-y: auto;
 }
-.notifications-footer[data-v-31a828f9] {
+.notifications-footer[data-v-73074f7a] {
   padding: 12px 16px;
   text-align: center;
   border-top: 1px solid #eee;
 }
-.notifications-footer a[data-v-31a828f9] {
+.notifications-footer a[data-v-73074f7a] {
   color: #2196f3;
   text-decoration: none;
   font-size: 0.9rem;
@@ -1603,7 +1603,7 @@ div.vue-tags-input.disabled * {
   width: 100%;
 }
 
-.subspotsartment[data-v-6f954e4d] {
+.subspotsartment[data-v-be40b3c0] {
   border: 1px solid rgba(0, 0, 0, 0.1);
   margin-top: 1rem;
 }
@@ -2508,10 +2508,10 @@ to {
 }
 .vue-select-header {
   height: 3rem;
-}.blink[data-v-eeb4cbf7] {
-  animation: blink-animation-eeb4cbf7 1s ease infinite;
+}.blink[data-v-c30b339c] {
+  animation: blink-animation-c30b339c 1s ease infinite;
 }
-@keyframes blink-animation-eeb4cbf7 {
+@keyframes blink-animation-c30b339c {
 0%, 100% {
     opacity: 1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.428",
+  "version": "0.2.429",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/chats/components/pages/ChatPage.vue

@@ -1,19 +1,11 @@
 <template>
-  <!-- <div class="chat-page h-max-20r"> -->
-    <!-- <aside class="chat-list"> -->
-      <!-- Примерный список чатов. Должен быть дополнен реальной логикой -->
-      <!-- <div v-for="chat in chats" :key="chat.id" @click="selectChat(chat.id)">
-        Чат {{ chat.name }}
-      </div> -->
-    <!-- </aside> -->
-    <!-- <main class="chat-main"> -->
-      <ChatWindow />
-    <!-- </main> -->
-  <!-- </div> -->
+  <main class="chat-main">
+    <ChatWindow />
+  </main>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
 import ChatWindow from '../sections/ChatWindow.vue';
 import chatStore from '../../store/chat.store.js';
 
@@ -22,29 +14,32 @@ const props = defineProps({
     type: String,
     required: true
   },
+  user: {
+    type: String,
+    required: true
+  },
   chatID: {
     type: String,
     required: true
   },
-})
-
-// const chats = ref([
-//   // Примерный список. В реальном приложении, список чатов должен загружаться с сервера.
-//   { id: 'chat1', name: 'Чат 1' },
-//   { id: 'chat2', name: 'Чат 2' }
-// ]);
+});
 
 const selectChat = (chatId) => {
   chatStore.methods.setCurrentChat(chatId);
 };
 
-onMounted(async() => {
+onMounted(async () => {
   chatStore.methods.setUsername(props.username || 'user'); // Установка имени пользователя
-  await chatStore.methods.connectWebSocket(); // Подключение к WebSocket
-  chatStore.methods.setCurrentChat(props.chatID);
+  await chatStore.methods.connectWebSocket(props.user); // Подключение к WebSocket
+  await chatStore.methods.setCurrentChat(props.chatID);
+});
+
+onUnmounted(() => {
+  // Clean up when the component is unmounted (e.g., navigating away)
+  chatStore.methods.disconnectChat();
 });
 </script>
 
 <style>
 /* Стили остаются без изменений */
-</style>
+</style>