@ozdao/martyrs 0.2.512 → 0.2.513

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-u7zgfMGL.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-CVRRj-vK.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/style.css

@@ -263,7 +263,14 @@ a.button {
 }*/
 .mobile-menu-section > div:last-of-type {
   border-bottom: none !important;
-}.no-scroll {
+}
+.border-bottom-except-last {
+  border-bottom: 1px solid rgba(var(--black) 0.1);
+}
+.border-bottom-except-last:last-child {
+  border-bottom: none;
+}
+.no-scroll {
   overflow: hidden;
 }
 .no-scroll #view {
@@ -786,7 +793,7 @@ button[data-v-2ba40647]:disabled {
   background: white;
 }
 
-.filters-content[data-v-798714cf] {
+.filters-content[data-v-d8872574] {
   max-height: 60vh;
   overflow-y: auto;
 }
@@ -2148,6 +2155,54 @@ to {
 
   /* Add styles for the user card component here */
 
+/* Ваши стили */
+.thc {
+  position: absolute;
+  right: 1rem;
+  top: 1rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  width: 6rem;
+  height: 6rem;
+  transition: all linear 0.1s;
+}
+.thc p:first-of-type {
+  font-size: 1.25rem;
+  letter-spacing: -2px;
+  z-index: 7;
+}
+.thc p:last-of-type {
+  z-index: 7;
+}
+.thc svg {
+  z-index: 6;
+  position: absolute;
+  width: 6rem;
+  height: 6rem;
+  left: 0;
+  top: 0;
+}
+@media screen and (max-width: 1025px) {
+.thc {
+    transform: scale(0.75) !important;
+    transform-origin: top right !important;
+}
+}.word-break {
+  width: 100%;
+  overflow: auto;
+  overflow-wrap: break-word;
+  word-break: break-all;
+  white-space: -moz-pre-wrap;
+  white-space: -hp-pre-wrap;
+  white-space: -o-pre-wrap;
+  white-space: -pre-wrap;
+  white-space: pre-wrap;
+  white-space: pre-line;
+  word-wrap: break-word;
+}
 .subdepartmentsartment[data-v-7a0fa935] {
   border: 1px solid rgba(0, 0, 0, 0.1);
   margin-top: 1rem;
@@ -2332,52 +2387,6 @@ to { opacity: 1; transform: translateY(0);
 }
 .card-title:hover .card-page-actions {
   display: block;
-}.thc {
-  position: absolute;
-  right: 1rem;
-  top: 1rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-  width: 6rem;
-  height: 6rem;
-  transition: all linear 0.1s;
-}
-.thc p:first-of-type {
-  font-size: 1.25rem;
-  letter-spacing: -2px;
-  z-index: 7;
-}
-.thc p:last-of-type {
-  z-index: 7;
-}
-.thc svg {
-  z-index: 6;
-  position: absolute;
-  width: 6rem;
-  height: 6rem;
-  left: 0;
-  top: 0;
-}
-@media screen and (max-width: 1025px) {
-.thc {
-    transform: scale(0.75) !important;
-    transform-origin: top right !important;
-}
-}.word-break {
-  width: 100%;
-  overflow: auto;
-  overflow-wrap: break-word;
-  word-break: break-all;
-  white-space: -moz-pre-wrap;
-  white-space: -hp-pre-wrap;
-  white-space: -o-pre-wrap;
-  white-space: -pre-wrap;
-  white-space: pre-wrap;
-  white-space: pre-line;
-  word-wrap: break-word;
 }
 .expand-enter-active[data-v-489e9d2e],
 .expand-leave-active[data-v-489e9d2e] {
@@ -2493,8 +2502,6 @@ to { opacity: 1; transform: translateY(0);
   border: 1px solid rgb(var(--second));
 }
 
-/* Ваши стили */
-
 .spiral {
 	
   background-size: cover;
@@ -2747,10 +2754,10 @@ to { opacity: 1; transform: translateY(0);
   color: white;
   display: inline-block;
 }
-.blink[data-v-b6c8ad09] {
-  animation: blink-animation-b6c8ad09 1s ease infinite;
+.blink[data-v-83eadb3a] {
+  animation: blink-animation-83eadb3a 1s ease infinite;
 }
-@keyframes blink-animation-b6c8ad09 {
+@keyframes blink-animation-83eadb3a {
 0%, 100% {
     opacity: 1;
 }

package/dist/{web--8-wgr6b.js → web-BW449LVt.js}

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

package/dist/{web-BS6utuAZ.cjs → web-CO3tWG6J.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-B1XN9Zjg.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-CVOBCkmD.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.512",
+  "version": "0.2.513",
   "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/Menu/MenuItem.vue

@@ -2,17 +2,14 @@
   import { h, ref, inject, defineComponent } from 'vue';
   
   import IconChevronRight from '@martyrs/src/modules/icons/navigation/IconChevronRight.vue';  
-
   export default defineComponent({
     props: {
     },
     setup(props, { slots }) {
       return () => {
         const defaultSlotContent = slots.default ? slots.default() : [];
-
         const iconSlot = [];
         const textSlot = [];
-
         // Changing the logic to place slots based on whether the type starts with 'Icon' or not
         defaultSlotContent.forEach((vnode) => {
           let compType = vnode.toString()
@@ -22,7 +19,6 @@
             textSlot.push(vnode);
           }
         });
-
         return h(
           'div',
           {
@@ -32,8 +28,7 @@
               'flex-nowrap',
               'flex-v-center',
               'flex',
-              // here we need add logic
-              { 'br-b br-black-transp-10 br-solid': true  }
+              'border-bottom-except-last'
             ]
           },
           [
@@ -69,3 +64,13 @@
     }
   });
 </script>
+
+<style>
+.border-bottom-except-last {
+  border-bottom: 1px solid rgba(var(--black) 0.1);
+}
+
+.border-bottom-except-last:last-child {
+  border-bottom: none;
+}
+</style>

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

@@ -70,7 +70,7 @@
 				<IconEdit
 					v-if="route.params._id === auth.state.user._id"
 					@click="$router.push({
-						name: 'User Edit Profile', 
+						name: 'Profile Edit Profile', 
 						params: {
 							_id: auth.state.user._id
 						}

package/src/modules/chats/components/sections/ChatWindow.vue

@@ -21,7 +21,7 @@
     </div>
 
     <div class="flex-nowrap flex-v-center flex bg-white w-100 radius-big pd-small">
-      <IconAdd class="mn-r-thin t-transp i-regular" />
+      <!-- <IconAdd class="mn-r-thin t-transp i-regular" /> -->
       <input class="" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
     </div>
   </div>

package/src/modules/events/components/pages/EventsBackoffice.vue

@@ -45,7 +45,6 @@
 			<Feed
 				:search="true"
 				v-model:sort="sort"
-				v-model:filter="filter"
 	      :states="{
 	        empty: {
 	          title: 'No Events Found',

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

@@ -63,6 +63,19 @@ function initializeGlobals(app, store, router, config, options = {}) {
   app.use(datePickerPlugin);
   // app.use(storeDebuggerPlugin, store);
 
+
+    
+  // Connect WebSocket only for authenticated users
+  
+    // const userId = this.store.auth.state.user?._id;
+  console.log('Connecting to websockets via globals');
+  websockets.initialize({
+    maxReconnectAttempts: 10,
+    reconnectDelay: 2000,
+  });
+
+  websockets.connect();
+
   // Change Locale to Route Locale if available
   router.beforeEach((to, from, next) => {
     const locale = to.params.locale;

package/src/modules/globals/views/components/sections/Filters.vue

@@ -35,10 +35,6 @@
     >
       <div class="flex-v-center flex-nowrap flex mn-b-medium">
         <h3 class="flex-child-full">Filters</h3>
-        <IconCross 
-          @click="showAllFilters = false" 
-          class="i-regular cursor-pointer"
-        />
       </div>
 
       <div class="filters-content">
@@ -168,12 +164,14 @@
           v-model:field="tempSelected[filter.value].min"
           :placeholder="filter.minPlaceholder || 'Min'"
           type="number"
+          :label="returnCurrency()"
           class="w-50 bg-light pd-small radius-small"
         />
         <Field
           v-model:field="tempSelected[filter.value].max"
           :placeholder="filter.maxPlaceholder || 'Max'"
           type="number"
+          :label="returnCurrency()"
           class="w-50 bg-light pd-small radius-small"
         />
       </div>

package/src/modules/inventory/components/pages/Inventory.vue

@@ -21,7 +21,6 @@
     <div class="rows-1">
       <Feed
         :search="true"
-        v-model:filter="filter"
         v-model:sort="sort"
         :store="{
           read: (options) => products.actions.read(options),

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -17,7 +17,7 @@
       <div class="w-100 pos-relative">
         <p class="t-truncate t-medium">{{ name }}</p>
         
-        <div>
+        <div class="mn-t-thin">
           <p v-if="price != null && quantity != null">
             <span class="t-second mn-r-micro d-inline-block t-demi">
               {{ returnCurrency() }}{{ totalPrice }}

package/src/modules/orders/components/forms/FormCustomerDetails.vue

@@ -1,18 +1,5 @@
 <template>
   <Block :title="title" class="mn-b-thin">
-    <Field 
-      v-model:field="customer.profile.name"   
-      label="Name"  
-      placeholder="Enter name"  
-      class="bg-white pd-small radius-small mn-b-thin"
-    />
-    <Field 
-      v-model:field="customer.email"   
-      label="Email"  
-      placeholder="Enter email"  
-      type="email"
-      class="bg-white pd-small radius-small mn-b-thin"
-    />
     <FieldPhone
       v-model="customer.number"  
       @country="(country) => { customer.phone = country }"
@@ -30,8 +17,43 @@
       mode="national"
       class="w-100 bg-white pd-small mn-b-thin radius-small" 
     />
+    <Field 
+      v-model:field="customer.profile.name"   
+      label="Name"  
+      placeholder="Enter name"  
+      class="bg-white pd-small radius-small mn-b-thin"
+    />
+    <Field 
+      v-model:field="customer.email"   
+      label="Email"  
+      placeholder="Enter email"  
+      type="email"
+      class="bg-white pd-small radius-small mn-b-thin"
+    />
+    
+    <div class="gap-thin mn-b-thin flex-justify-between flex-nowrap flex">
+      <Select 
+        :select="messengerSelected"
+        :options="[
+          {name: 'Instagram', value: 'instagram'}, 
+          {name: 'Telegram', value: 'telegram'}, 
+          {name: 'WhatsApp', value: 'whatsapp'},
+        ]"
+        @update:select="(option) => messengerSelected = option"
+        placeholder="Messenger" 
+        size="small"
+        class="bg-white  pd-small radius-small"
+      />
+      <Field
+        v-model:field="customer.socials[messengerSelected.value]"     
+        label="@"  
+        placeholder="Enter username"
+        class="bg-white pd-small radius-small w-100"
+      />
+    </div>
     
     <Select 
+      v-if="showAdminFields"
       :select="sourceSelected"
       :options="[
         {name: 'Web', value: 'web'}, 
@@ -49,6 +71,7 @@
     />
 
     <Field 
+      v-if="showAdminFields"
       v-model:field="customer.referral.code"   
       label="Referral Code"  
       placeholder="Enter referral code"  
@@ -64,7 +87,7 @@
     />
 
     <!-- Address Fields -->
-    <div class="mn-t-small">
+    <div v-if="showAddressFields" class="mn-t-small">
       <h3 class="t-medium mn-b-thin">Address Information</h3>
       
       <Field 
@@ -106,6 +129,7 @@
     </div>
 
     <Select 
+      v-if="showAdminFields"
       :select="statusSelected"
       :options="[
         {name: 'Active', value: 'active'}, 
@@ -117,28 +141,9 @@
       class="bg-white pd-small radius-small mn-b-thin"
     />
     
-    <div class="gap-thin flex-justify-between flex-nowrap flex">
-      <Select 
-        :select="messengerSelected"
-        :options="[
-          {name: 'Instagram', value: 'instagram'}, 
-          {name: 'Telegram', value: 'telegram'}, 
-          {name: 'WhatsApp', value: 'whatsapp'},
-        ]"
-        @update:select="(option) => messengerSelected = option"
-        placeholder="Messenger" 
-        size="small"
-        class="bg-white  pd-small radius-small"
-      />
-      <Field
-        v-model:field="customer.socials[messengerSelected.value]"     
-        label="@"  
-        placeholder="Enter username"
-        class="bg-white pd-small radius-small w-100"
-      />
-    </div>
 
-    <div class="gap-thin flex mn-t-small">
+
+    <div v-if="showButtons" class="gap-thin flex mn-t-small">
       <Button 
         @click="handleSave"
         class="w-100 pd-small radius-big bg-main t-black uppercase t-medium"
@@ -177,6 +182,18 @@ defineProps({
   createMode: {
     type: Boolean,
     default: false
+  },
+  showAdminFields: {
+    type: Boolean,
+    default: true
+  },
+  showButtons: {
+    type: Boolean,
+    default: true
+  },
+  showAddressFields: {
+    type: Boolean,
+    default: true
   }
 });
 

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

@@ -112,7 +112,7 @@
 
 
 	  
-	  <div v-if="order" class="gap-thin cols-2">
+	  <div v-if="order" class="gap-thin cols-2 mobile:cols-1">
 
 	    <div class="w-100">
 
@@ -132,7 +132,7 @@
 		    >
 		    	<div class="pd-small flex-nowrap flex">
 			    	<div class="mn-r-auto">
-				    	<span class="d-block t-medium p-medium">Order is</span>
+				    	<span class="d-block t-medium p-medium mn-b-thin">Order is</span>
 					    <span class=" t-lh-075 h2 d-block mn-b-small">{{order.status}}</span>
 					    <p class="pd-thin radius-extra bg-black t-white w-max">{{formatDate(order.updatedAt, {language: locale })}}</p>
 					  </div>

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

@@ -23,7 +23,7 @@
 		</div>
 	</div>
 	<!-- Order form -->
-	<div class="gap-small mn-b-thin cols-2">
+	<div class="gap-small mn-b-thin cols-2 mobile:cols-1">
 		<!-- Order Form -->
 		<div
 			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0" 
@@ -31,6 +31,8 @@
 		>
 			<FormCustomerDetails
 				v-model:customer="orders.state.current.customer"
+			  :showAdminFields="false"
+			  :showButtons="false"
 			/>
 			<FormPayment 	
 				v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0"

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

@@ -9,7 +9,7 @@
         v-model:radio="order.delivery.type"
         :label="capitalize(type)"
         :value="type"
-        class="bg-white pd-medium radius-small w-100 mn-r-small"
+        class="bg-white field-wrapper cursor-pointer pd-medium radius-small w-100 mn-r-small"
       />
     </div>
     <div v-else>No delivery options available.</div>
@@ -27,7 +27,7 @@
         :showPaymentOptions="false"
         :selected="order.delivery.spot === spot._id"
         @click="() => order.delivery.spot = order.delivery.spot === spot._id ? null : spot._id"
-        class="mn-b-thin radius-medium o-hidden bg-white"
+        class="field-wrapper cursor-pointer mn-b-thin radius-medium o-hidden bg-white"
       />
     </template>
 

package/src/modules/orders/orders.client.js

@@ -44,6 +44,8 @@ function initializeOrders(app, store, router, options = {}) {
   const routeOrganizations = options.routeOrganizations || 'OrganizationRoot';
   const routeUsers = options.routeUsers || 'User Profile Root';
 
+  if (typeof window !== 'undefined') storeShopcart.actions.setShopcart()
+
   addRoutes(router, {
     parentName: route,
     basePath: 'orders',

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

@@ -133,7 +133,7 @@
 		</section>
 
 		<!-- Organization Info Section -->
-		<div class="pos-relative">
+		<!-- <div class="pos-relative">
 			<div class="bg-light radius-medium pd-medium">
 				<h3 class="mn-b-small">About {{ organization.state.current?.profile?.name }}</h3>
 				<p v-if="organization.state.current?.profile?.description" class="t-medium">
@@ -143,7 +143,9 @@
 					No description available.
 				</p>
 			</div>
-		</div>
+		</div> -->
+
+		<Products/>
 	</div>
 </template>
 
@@ -173,6 +175,8 @@
 	import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
 	// Report Module
 	import FormReport from '@martyrs/src/modules/reports/components/sections/FormReport.vue'
+	// Products modu;e
+	import Products from '@martyrs/src//modules/products/components/pages/Products.vue'
 	// Import state
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';