@ozdao/martyrs 0.2.507 → 0.2.509

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-Dq-UfO4G.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-DSiCr7yl.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils2.cjs");
+const utils = require("../../../../../../../_virtual/utils.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils.cjs");
+const utils = require("../../../../../../../_virtual/utils2.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/orders.server.cjs

@@ -577,6 +577,24 @@ const ModelCustomer = (db) => {
         type: String,
         enum: ["active", "inactive", "blocked"],
         default: "active"
+      },
+      address: {
+        country: {
+          type: String
+        },
+        addressLine1: {
+          type: String,
+          required: true
+        },
+        addressLine2: {
+          type: String
+        },
+        city: {
+          type: String
+        },
+        postalCode: {
+          type: String
+        }
       }
     },
     {
@@ -1059,6 +1077,26 @@ const verifierFactory = function(db) {
         type: globals_verifier.Validator.schema().string().oneOf(["user", "organization", "User", "Organization"]),
         target: globals_verifier.Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
+    },
+    "address.country": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const updateVerifier = new globals_verifier.Verifier({
@@ -1109,6 +1147,26 @@ const verifierFactory = function(db) {
     status: {
       rule: "optional",
       validator: globals_verifier.Validator.schema().string().oneOf(["active", "inactive", "blocked"])
+    },
+    "address.country": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const readVerifier = new globals_verifier.Verifier({

package/dist/orders.server.js

@@ -575,6 +575,24 @@ const ModelCustomer = (db) => {
         type: String,
         enum: ["active", "inactive", "blocked"],
         default: "active"
+      },
+      address: {
+        country: {
+          type: String
+        },
+        addressLine1: {
+          type: String,
+          required: true
+        },
+        addressLine2: {
+          type: String
+        },
+        city: {
+          type: String
+        },
+        postalCode: {
+          type: String
+        }
       }
     },
     {
@@ -1057,6 +1075,26 @@ const verifierFactory = function(db) {
         type: Validator.schema().string().oneOf(["user", "organization", "User", "Organization"]),
         target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
+    },
+    "address.country": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const updateVerifier = new Verifier({
@@ -1107,6 +1145,26 @@ const verifierFactory = function(db) {
     status: {
       rule: "optional",
       validator: Validator.schema().string().oneOf(["active", "inactive", "blocked"])
+    },
+    "address.country": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const readVerifier = new Verifier({

package/dist/products.server.cjs

@@ -678,7 +678,17 @@ const productLookupConfigs = {
       from: "products",
       localField: "recommended",
       foreignField: "_id",
-      as: "recommended"
+      as: "recommended",
+      pipeline: [
+        {
+          $lookup: {
+            from: "variants",
+            localField: "_id",
+            foreignField: "product",
+            as: "variants"
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта

package/dist/products.server.js

@@ -676,7 +676,17 @@ const productLookupConfigs = {
       from: "products",
       localField: "recommended",
       foreignField: "_id",
-      as: "recommended"
+      as: "recommended",
+      pipeline: [
+        {
+          $lookup: {
+            from: "variants",
+            localField: "_id",
+            foreignField: "product",
+            as: "variants"
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта

package/dist/style.css

@@ -1123,12 +1123,12 @@ div.vue-tags-input.disabled * {
     font-size: .85em;
 }
 
-.fade-enter-active[data-v-fe817eef],
-.fade-leave-active[data-v-fe817eef] {
+.fade-enter-active[data-v-c1b1de8c],
+.fade-leave-active[data-v-c1b1de8c] {
   transition: opacity 0.3s ease;
 }
-.fade-enter-from[data-v-fe817eef],
-.fade-leave-to[data-v-fe817eef] {
+.fade-enter-from[data-v-c1b1de8c],
+.fade-leave-to[data-v-c1b1de8c] {
   opacity: 0;
 }
 .slider-hotpost :deep(.carousel__slide) {
@@ -1546,7 +1546,35 @@ to {
 [data-v-6db7716d]::-webkit-scrollbar-thumb:hover {
   background-color: var(--grey-small);
 }
-
+.eye[data-v-4241147a] {
+  animation: rotateEye-4241147a 10s linear infinite;
+  transform-origin: center 55%;
+}
+.mouth[data-v-4241147a] {
+  animation: rotateMouth-4241147a 20s ease-in-out infinite;
+  transform-origin: center 55%;
+}
+@keyframes rotateEye-4241147a {
+from {
+    transform: rotate(0deg);
+}
+to {
+    transform: rotate(360deg);
+}
+}
+@keyframes rotateMouth-4241147a {
+0% {
+    transform: rotate(0deg);
+}
+50% {
+    transform: rotate(180deg);
+}
+100% {
+    transform: rotate(360deg);
+}
+}.cols-3-footer {
+  grid-template-columns: 5fr 7fr 4fr;
+}
 fieldset[disabled] .multiselect {
   pointer-events: none;
 }
@@ -1995,33 +2023,7 @@ to {
   opacity: 0;
   transform: scale(0.9);
 }
-.eye[data-v-8ec01df7] {
-  animation: rotateEye-8ec01df7 10s linear infinite;
-  transform-origin: center 55%;
-}
-.mouth[data-v-8ec01df7] {
-  animation: rotateMouth-8ec01df7 20s ease-in-out infinite;
-  transform-origin: center 55%;
-}
-@keyframes rotateEye-8ec01df7 {
-from {
-    transform: rotate(0deg);
-}
-to {
-    transform: rotate(360deg);
-}
-}
-@keyframes rotateMouth-8ec01df7 {
-0% {
-    transform: rotate(0deg);
-}
-50% {
-    transform: rotate(180deg);
-}
-100% {
-    transform: rotate(360deg);
-}
-}
+
 .h-60[data-v-c38b132b] {
   height: 60%;
 }

package/dist/{web-DaBwwCQ5.cjs → web-XyQNm3cW.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-AWSb_d2P.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-D89N_jml.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/dist/{web-BXajFCU2.js → web-gtBkwjra.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-Dq-UfO4G.js";
+import { W as p } from "./main-DSiCr7yl.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.507",
+  "version": "0.2.509",
   "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/components/Feed/Carousel.vue

@@ -6,7 +6,7 @@
     </div>
     <!-- Empty State -->
     <EmptyState
-      v-if="!isLoading && !entities.length < 1"
+      v-else-if="entities.length < 1"
       :title="states.empty.title"
       :description="states.empty.description"
       :action="states.empty.action"
@@ -65,9 +65,11 @@ const { t } = useI18n({
 onMounted(async() => {
   try {
     entities.value = await props.store.read(props.options)
+    isLoading.value = false
   } catch (error) {
     console.error('Error loading entities:', error)
     entities.value = []
+    isLoading.value = false
   } finally {
     isLoading.value = false
   }

package/src/components/FieldBig/FieldBig.vue

@@ -9,7 +9,7 @@
     :name="fieldName"
     :id="fieldId"
     :validation="validation"
-    class="pd-l-medium radius-extra flex-nowrap flex  w-100 p-medium t-regular uppercase pd-thin"
+    class="radius-medium flex-nowrap flex  w-100 p-medium t-regular uppercase pd-thin"
   >
     <slot></slot>
     <Button
@@ -18,7 +18,7 @@
       :showLoader="showLoader"
       :callback="callback"
       :callbackDelay="callbackDelay"
-      class="t-nowrap t-medium radius-big uppercase cursor-pointer flex flex-v-center pd-thin w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main"
+      class="t-nowrap t-medium radius-small uppercase cursor-pointer flex flex-v-center pd-thin w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main"
     >
       <span v-if="action" class="desktop-only mn-r-thin">{{action}}</span>
       <IconArrow class="i-medium"/>

package/src/modules/auth/views/components/pages/ProfileEdit.vue

@@ -1,18 +1,10 @@
 <template>
   <Popup 
-    :isPopupOpen="true" 
-    @close-popup="router.push({ 
-      name: 'User Profile', 
-      params: { 
-        _id: auth.state.user._id 
-      },
-      query: { 
-        afterAuth: 'true' 
-      }
-    })"
+    :isPopupOpen="isOpen" 
+    @close-popup="closeProfileEdit()"
     title="Edit Profile"
     align="center center"
-    class="w-m-33r h-40r mobile:h-100 h-m-40r bg-white radius-medium pd-medium"
+    class="w-m-50r h-40r mobile:h-100 h-m-40r bg-white mobile:radius-zero radius-medium pd-medium"
   >
     <div v-if="loading" class="flex-center h-100">
       <Loader />
@@ -42,8 +34,23 @@
   
   const loading = ref(true)
   const userData = ref(null)
+  const isOpen = ref(false)
+
+  function closeProfileEdit () {
+    isOpen.value = false
+    router.push({ 
+      name: 'User Profile', 
+      params: { 
+        _id: auth.state.user._id 
+      },
+      query: { 
+        afterAuth: 'true' 
+      }
+    })
+  }
   
   onMounted(async () => {
+    isOpen.value = true
     try {
       const userId = route.params._id || auth.state.user._id
       await users.actions.read({ _id: userId, user: auth.state.user._id })

package/src/modules/globals/globals.client.js

@@ -14,6 +14,7 @@ import Header from '@martyrs/src/modules/globals/views/components/partials/Heade
 import Navigation from '@martyrs/src/modules/globals/views/components/partials/Navigation.vue';
 import NavigationBar from '@martyrs/src/modules/globals/views/components/partials/NavigationBar.vue';
 import Sidebar from '@martyrs/src/modules/globals/views/components/partials/Sidebar.vue';
+import Footer from '@martyrs/src/modules/globals/views/components/partials/Footer.vue';
 
 import * as mixins from './views/mixins/mixins.js';
 import * as storeGlobals from './views/store/globals.js';
@@ -113,6 +114,7 @@ const ModuleGlobals = {
       layoutApp,
       Header,
       Navigation,
+      Footer,
       Sidebar,
       BottomNavigationBar,
       NavigationBar,
@@ -123,6 +125,7 @@ const ModuleGlobals = {
 export {
   BlockSearch,
   Header,
+  Footer,
   Navigation,
   NavigationBar,
   Sidebar,