@ozdao/martyrs 0.2.451 → 0.2.453

package/dist/martyrs.es.js

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

package/dist/style.css

@@ -955,50 +955,7 @@ div.vue-tags-input.disabled * {
 .slider-hotpost .embla__slide {
     flex: 0 0 75%;
 }
-}
-  /* Base layout styles */
-#app-wrapper {
-  position: relative;
-  width: 100%;
-  min-height: 100vh;
-}
-
-/* Layout with sidebar expanded */
-.content-with-sidebar {
-  margin-left: 18rem;
-  width: calc(100% - 18rem);
-  transition: all 0.3s ease-in-out;
-}
-
-/* Layout with sidebar collapsed */
-.content-full-width {
-  margin-left: 3rem; /* Width of collapsed sidebar with icons only */
-  width: calc(100% - 3rem);
-  transition: all 0.3s ease-in-out;
-}
-
-/* Mobile layout adjustments */
-@media (max-width: 768px) {
-.content-with-sidebar,
-  .content-full-width {
-    margin-left: 0 !important;
-    width: 100% !important;
-}
-  
-  /* When sidebar is expanded on mobile, we add overlay effect */
-.sidebar-expanded-layout::after {
-    content: '';
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 90;
-    transition: opacity 0.3s ease;
-}
-}
-.error-wrapper {
+}.error-wrapper {
   position: absolute;
   left: 0;
   right: 0;
@@ -1063,18 +1020,9 @@ div.vue-tags-input.disabled * {
   width: 33%;
   overflow-y: scroll;
 }
-.shop-cart .shopcart-footer {
-  position: fixed;
-  bottom: 0;
-  width: 33%;
-  right: -33%;
-}
 .shop-cart-active {
   right: 0;
 }
-.shop-cart-active .shopcart-footer {
-  right: 0;
-}
 @media screen and (max-width: 1025px) {
 .shop-cart {
     width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.451",
+  "version": "0.2.453",
   "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/builder/webpack/webpack.config.client.js

@@ -36,11 +36,11 @@ module.exports = (projectRoot) => {
       // ...(!isProd ? [new webpack.HotModuleReplacementPlugin()] : []),
       new StatsWriterPlugin(),
       ...(!isProd ? [
-        new WorkboxPlugin.GenerateSW({
-          clientsClaim: true,
-          skipWaiting: true,
-          disableDevLogs: true
-        }),
+        // new WorkboxPlugin.GenerateSW({
+        //   clientsClaim: true,
+        //   skipWaiting: true,
+        //   disableDevLogs: true
+        // }),
       ] : []),
       new PurgeCSSPlugin({
         printRejected: true,

package/src/components/Feed/Feed.vue

@@ -24,7 +24,7 @@
       <BottomSheet
         :show="filter.active"
         @toggle="() => filter.active = false"
-        class="z-index-10 pos-fixed pos-t-0 pos-r-0"
+        class="z-index-10 pos-absolute pos-t-0 pos-r-0"
         :class="{
           'pos-t-0':  filter.active,
           'pos-t-100': !filter.active

package/src/modules/auth/views/components/layouts/Auth.vue

@@ -1,10 +1,10 @@
 <template>
   <div 
-  	class="cols-2-1_2 gap-small pd-small bg-white"
+  	class="cols-2-1_2 gap-small pd-small"
   >
 
     <router-view
-    	class="pd-big w-m-66r t-center" 
+    	class="pd-big mobile:pd-medium w-m-66r t-center" 
     	v-slot="{ Component, route }"
     >
       <transition 

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

@@ -86,7 +86,7 @@
 		<Button 
 			:submit="onSubmit" 
 			:callback="redirectTo" 
-			class="w-100 bg-main mn-b-thin"
+			class="w-100 bg-main"
 		>
 			{{ t('signin') }}
 		</Button>

package/src/modules/globals/views/components/layouts/App.vue

@@ -1,26 +1,6 @@
 <template>
-  <transition 
-    name="moveFromTop" 
-    mode="out-in"
-  >
-    <section 
-      v-if="FirstUse && route.meta.walkthrough"
-      class="w-100 h-100" 
-     >
-      <component 
-        :is="route.meta.walkthrough"
-        name="Walkthrough"
-        @updateFirstUse="updateFirstUse" 
-        :slides="[1,2,3]" 
-        class="tab"
-      >
-      </component>
-    </section>
-  </transition>
-
   <router-view 
     v-slot="{ Component }"
-    class="transition-ease-in-out h-min-100 w-100 pos-relative"
   >
     <component ref="page" :is="Component"/>
   </router-view>
@@ -55,14 +35,13 @@
   /////////////////////////////
   // META
   /////////////////////////////
-  const { t, locale } = useI18n({
+  const { t, locale, availableLocales } = useI18n({
     messages: props.messages
   })
 
-
   const route = useRoute();
 
-  const languages = ['en', 'ru'];
+  const languages = availableLocales;
   const base_url = process.env.FILE_SERVER_URL;
 
   function removeTrailingSlash(url) {
@@ -113,80 +92,12 @@
   });
 
   useHead(metadata)
-  /////////////////////////////
-  // FIRST USE
-  /////////////////////////////
-  const FirstUse = ref(false);
-
-  import { Preferences } from '@capacitor/preferences';
-  import { Keyboard } from '@capacitor/keyboard';
-
-  if (process.env.MOBILE_APP === 'ios') Keyboard.setAccessoryBarVisible({ isVisible: false }) 
-
-  async function getFirstUse() {
-    const ret = await Preferences.get({ key: 'first-use' });
-    FirstUse.value = ret.value ? JSON.parse(ret.value) : true;
-  }
-
-  const updateFirstUse = (value) => {
-    FirstUse.value = value;
-  }
-
+ 
   onBeforeMount(async()=>{
     const { value } = await Preferences.get({ key: 'darkmode' });
+    
     const isDarkMode = value ? JSON.parse(value) : false;
     
-    // Устанавливаем тему
     globals.actions.setTheme(isDarkMode);
   })
-
-  onMounted(async () => {
-    await getFirstUse()
-    if (page) show.value = true
-  });
-</script>
-
-<style>
-  /* Base layout styles */
-#app-wrapper {
-  position: relative;
-  width: 100%;
-  min-height: 100vh;
-}
-
-/* Layout with sidebar expanded */
-.content-with-sidebar {
-  margin-left: 18rem;
-  width: calc(100% - 18rem);
-  transition: all 0.3s ease-in-out;
-}
-
-/* Layout with sidebar collapsed */
-.content-full-width {
-  margin-left: 3rem; /* Width of collapsed sidebar with icons only */
-  width: calc(100% - 3rem);
-  transition: all 0.3s ease-in-out;
-}
-
-/* Mobile layout adjustments */
-@media (max-width: 768px) {
-  .content-with-sidebar,
-  .content-full-width {
-    margin-left: 0 !important;
-    width: 100% !important;
-  }
-  
-  /* When sidebar is expanded on mobile, we add overlay effect */
-  .sidebar-expanded-layout::after {
-    content: '';
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 90;
-    transition: opacity 0.3s ease;
-  }
-}
-</style>
+</script>

package/src/modules/globals/views/components/layouts/Client.vue

@@ -1,7 +1,7 @@
 <template>
 	<div 
 		id="app-wrapper"
-		class="pos-relative o-hidden"
+		class="flex flex-column h-100 w-100 pos-relative o-hidden"
 		:class="{
   		'pd-t-extra': MOBILE_APP === 'ios',  
 			'bg-white': headerTheme === 'light',
@@ -11,7 +11,27 @@
 		<transition name="moveFromTop" appear>
 			<Loader v-if="!page || isPageLoading" class="pos-fixed"/>
 		</transition>
-	
+
+
+	  <transition 
+	    name="moveFromTop" 
+	    mode="out-in"
+	  >
+	    <section 
+	      v-if="FirstUse && route.meta.walkthrough"
+	      class="w-100 h-100" 
+	     >
+	      <component 
+	        :is="route.meta.walkthrough"
+	        name="Walkthrough"
+	        @updateFirstUse="updateFirstUse" 
+	        :slides="[1,2,3]" 
+	        class="tab"
+	      >
+	      </component>
+	    </section>
+	  </transition>
+
     <component
 			v-if="!MOBILE_APP && route.meta.header"
       ref="header" 
@@ -48,11 +68,12 @@
 	  	<LocationSelection />
 	  </Popup>
 
+	  <!-- class="flex flex-nowrap transition-ease-in-out o-hidden pos-relative" -->
 		<section 
 			id="screen" 
 			ref="screen"
 			@scroll="handleScroll"
-			class="flex flex-nowrap transition-ease-in-out o-hidden pos-relative"
+			class="flex flex-nowrap h-100 pos-relative o-hidden  transition-ease-in-out"
 			:class="{
 				'': MOBILE_APP === 'ios',
       }"
@@ -91,7 +112,7 @@
 		      />
 	      </transition>
 	    </component>
-		  
+		  <!-- rows-1-min0_max1 z-index-1 pos-relative w-100 h-100 -->
 		  <div class="rows-1-min0_max1 z-index-1 pos-relative w-100 h-100">
   			<Status 
 					v-if="globals.state.error.show" 
@@ -229,18 +250,37 @@
 	const handleScroll = () => {
 	  scrollOffset.value = event.target.scrollTop
 	};
+/////////////////////////////
+  // FIRST USE
+  /////////////////////////////
+  const FirstUse = ref(false);
+
+  import { Preferences } from '@capacitor/preferences';
+  import { Keyboard } from '@capacitor/keyboard';
+
+  if (process.env.MOBILE_APP === 'ios') Keyboard.setAccessoryBarVisible({ isVisible: false }) 
+
+  async function getFirstUse() {
+    const ret = await Preferences.get({ key: 'first-use' });
+    FirstUse.value = ret.value ? JSON.parse(ret.value) : true;
+  }
+
+  const updateFirstUse = (value) => {
+    FirstUse.value = value;
+  }
 
 	onMounted(async () => {
-		 
-		if ('serviceWorker' in navigator) {
-	   	window.addEventListener('load', () => {
-	     	navigator.serviceWorker.register('/service-worker.js').then(registration => {
-	       	console.log('SW registered: ', registration);
-	     	}).catch(registrationError => {
-	       	console.log('SW registration failed: ', registrationError);
-	     	});
-	   });
-	 	}
+	  await getFirstUse()
+
+		// if ('serviceWorker' in navigator) {
+	  //  	window.addEventListener('load', () => {
+	  //    	navigator.serviceWorker.register('/service-worker.js').then(registration => {
+	  //      	console.log('SW registered: ', registration);
+	  //    	}).catch(registrationError => {
+	  //      	console.log('SW registration failed: ', registrationError);
+	  //    	});
+	  //  });
+	 	// }
 		
 		const savedPosition = localStorage.getItem('position');
 

package/src/modules/globals/views/mixins/mixins.js

@@ -2,7 +2,7 @@ import * as globals from '@martyrs/src/modules/globals/views/store/globals'
 
 // useGlobalMixins.js
 export function useGlobalMixins() {
-  const isClientSide = typeof window !== 'undefined'
+
 
   const isAdmin = (roles) => {
     if (roles) {
@@ -192,6 +192,8 @@ const formatDate = (d, options = {}) => {
     return base;
   }
 
+  const isClientSide = typeof window !== 'undefined' && typeof document !== 'undefined'
+
   const getCssVar = (name) => {
     if (!isClientSide) return '' // SSR fallback
     return getComputedStyle(document.documentElement)
@@ -199,35 +201,50 @@ const formatDate = (d, options = {}) => {
       .trim()
   }
 
+  const matchMediaSafe = (query) => {
+    if (!isClientSide) return { matches: false }
+    return window.matchMedia(query)
+  }
+
   const isMediaMax = (varName) => {
-    if (!isClientSide) return false
     const maxWidth = getCssVar(varName)
-    return window.matchMedia(`(max-width: ${maxWidth})`).matches
+    return matchMediaSafe(`(max-width: ${maxWidth})`).matches
   }
 
   const isMediaMin = (varName) => {
-    if (!isClientSide) return false
     const minWidth = getCssVar(varName)
-    return window.matchMedia(`(min-width: ${minWidth})`).matches
+    return matchMediaSafe(`(min-width: ${minWidth})`).matches
   }
 
-
   const isFlipPhone = () => isMediaMax('--flip-phone-max')
   const isPhone = () => isMediaMax('--phone-landscape-max')
-  const isTabletPortrait = () => window.matchMedia(
-    `(min-width: ${getCssVar('--tablet-portrait-min')}) and (max-width: ${getCssVar('--tablet-portrait-max')})`
-  ).matches
-  const isTabletLandscape = () => window.matchMedia(
-    `(min-width: ${getCssVar('--tablet-landscape-min')}) and (max-width: ${getCssVar('--tablet-landscape-max')})`
-  ).matches
+
+  const isTabletPortrait = () => {
+    const min = getCssVar('--tablet-portrait-min')
+    const max = getCssVar('--tablet-portrait-max')
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
+  }
+
+  const isTabletLandscape = () => {
+    const min = getCssVar('--tablet-landscape-min')
+    const max = getCssVar('--tablet-landscape-max')
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
+  }
+
   const isTablet = () => isTabletPortrait() || isTabletLandscape()
 
-  const isDesktop = () => window.matchMedia(
-    `(min-width: ${getCssVar('--desktop-min')}) and (max-width: ${getCssVar('--desktop-max')})`
-  ).matches
-  const isXLDesktop = () => window.matchMedia(
-    `(min-width: ${getCssVar('--xl-desktop-min')}) and (max-width: ${getCssVar('--xl-desktop-max')})`
-  ).matches
+  const isDesktop = () => {
+    const min = getCssVar('--desktop-min')
+    const max = getCssVar('--desktop-max')
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
+  }
+
+  const isXLDesktop = () => {
+    const min = getCssVar('--xl-desktop-min')
+    const max = getCssVar('--xl-desktop-max')
+    return matchMediaSafe(`(min-width: ${min}) and (max-width: ${max})`).matches
+  }
+
   const isXXLDesktop = () => isMediaMin('--xxl-desktop-min')
 
 

package/src/modules/icons/logos/Logotype.vue

@@ -1,5 +1,5 @@
 <template>
-  <svg class="h-2r w-max" width="270" height="300" viewBox="0 0 270 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg class="h-2r w-auto" width="270" height="300" viewBox="0 0 270 300" fill="none" xmlns="http://www.w3.org/2000/svg">
     <g clip-path="url(#clip0)">
       <path fill-rule="evenodd" clip-rule="evenodd" d="M264.626 52.2791C265.531 57.2858 266 62.4066 266 67.6155C266 125.882 207.349 173.116 135 173.116C62.6507 173.116 4 125.882 4 67.6155C4 62.4066 4.46875 57.2858 5.37413 52.2791C11.0997 32.6306 21.1714 14.8341 34.4789 0C34.1621 2.17658 34 4.38345 34 6.61562C34 43.8948 79.2192 74.1156 135 74.1156C190.781 74.1156 236 43.8948 236 6.61562C236 4.38345 235.838 2.17659 235.521 5.29254e-06C248.829 14.8341 258.9 32.6306 264.626 52.2791Z" fill="#00FF88"/>
       <path d="M270 165C270 239.558 209.558 300 135 300C60.4416 300 0 239.558 0 165C0 90.4416 60.4416 30 135 30C209.558 30 270 90.4416 270 165Z" fill="#00FF88"/>

package/src/modules/marketplace/views/components/pages/Catalog.vue

@@ -2,9 +2,7 @@
 	<Feed
 		v-model:sort="marketplace.state.sort"
 		v-model:filter="marketplace.state.filter"
-    :search="{
-    	autofocus:true
-    }"
+    :search="true"
     :showLoadMore="false"
     :states="{
       empty: {

package/src/modules/orders/components/partials/ShopCart.vue

@@ -1,9 +1,9 @@
 <template>
-	<section class="z-index-5 transition-ease-in-out pd-big mobile:pd-medium bg-white shop-cart" :class="{'shop-cart-active':shopcart.state.currentState === true}">
+	<section class="z-index-5 flex flex-column  transition-ease-in-out bg-white shop-cart" :class="{'shop-cart-active':shopcart.state.currentState === true}">
     <!-- ---------------------------------------------------------------- -->
     <!-- 01. Popup Header  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="flex-nowrap flex">
+    <div class="pd-big mobile:pd-medium pd-b-zero mobile:pd-b-zero flex-nowrap flex">
       <div class="mn-b-medium w-100">
         <h4 class="mn-b-thin p-big">{{t('title')}}</h4>
         <p class="t-transp p-small">{{t('subtitle')}} {{ t('positions', { count: StoreCartAmount }) }}</p>
@@ -13,7 +13,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Popup Content  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="h-100 flex flex-column w-100 pos-relative o-x-hidden o-y-scroll gap-small shopcart-content">
+    <div class="pd-big mobile:pd-medium h-70 flex flex-column w-100 pos-relative o-x-hidden o-y-scroll gap-small shopcart-content">
       <!-- Empty State -->
       <p v-if="!(shopcart.state.positions.length > 0)" class="mn-t-medium"><i>{{t('emptystate')}}</i></p>
       <!-- Shopcart positions -->
@@ -31,7 +31,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 03. Footer  -->
     <!-- ---------------------------------------------------------------- -->
-    <div  class="shopcart-footer transition-ease-in-out pd-b-medium pd-t-medium pd-big transition-cubic bg-light t-black">
+    <div  class="h-30 transition-ease-in-out pd-b-medium pd-t-medium pd-big transition-cubic bg-light t-black">
       <div v-if="shopcart.state.positions.length > 0" class="mn-b-small total-price">
        <PriceTotal 
           :totalPrice="cartTotalPrice"
@@ -146,22 +146,11 @@
   width: 33%;
 
   overflow-y: scroll; 
-
-  .shopcart-footer {
-    position: fixed;
-    bottom: 0;
-    
-    width: 33%;
-    right: -33%;
-  }
 }
 
 .shop-cart-active {
   right: 0;
 
-  .shopcart-footer {
-    right: 0;
-  }
 }
 
 @media screen and (max-width: 1025px) {

package/src/modules/orders/store/shopcart.js

@@ -26,7 +26,6 @@ const helpers = {
       images: product.images,
       name: product.name,
       price: product.price,
-      price_currency: product.price_currency,
       listing: product.listing,
       quantity: 1,
       org_id: organization,
@@ -155,7 +154,6 @@ const actions = {
         name: product.name,
         listing: product.listing,
         price: product.price,
-        price_currency: product.price_currency,
         quantity: 1,
         date: date, 
         org_id: organization, // Добавляем _id организации к каждому продукту

package/src/styles/base/borders.scss

@@ -27,7 +27,13 @@ body {
 	}
 
 	// Border Clasess
-	.br-zero {  border-width: 0 }
+	.br-zero { 
+		border-width: 0;
+		border-top-width: 0;
+		border-right-width: 0;
+		border-bottom-width: 0;
+		border-left-width: 0;
+	}
 	.br-1px { border-width: 1px; }
 	.br-2px { border-width: 2px; }
 	/* Border style */

package/src/styles/layout.scss

@@ -2,20 +2,6 @@
 	box-sizing: border-box;
 }
 
-/*img {
-  flex: 0 0 35%;
-  min-width: 0;
-  object-fit: cover;
-}*/
-
-html, body {
-	position: relative;
-	width: 100vh;
-	height: 100vh;
-	overscroll-behavior: none;
-}
-
-
 html {
 	backface-visibility: hidden;
 	text-rendering: geometricPrecision;
@@ -26,41 +12,17 @@ html {
 body {
 	background: rgb(var(--white));
 	color: rgb(var(--black));; 
-	// -ms-overflow-style: none;
-	// overflow-y: hidden;
-	// overflow-x: hidden;
 }
 
 html,
-body {
+body,
+#app,
+ {
   position: relative;
   width: 100%;
   height: 100%;
-  // overflow-x: hidden;
 }
 
-#app {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-}
-
-#app-wrapper {
-	// display: grid;
-	// grid-template-rows: minmax(1px, auto) 1fr;
-	display: flex;
-	flex-direction: column;
-	position: relative;
-	height: 100%;
-	width: 100%;
-}
-
-#screen {
-	// min-height: 100%;
-	flex: 1 0 auto; /* Enable flex grow */
-  height: 0;
-}
 
 // TURN OFF SCROLL AND CUROURS
 // * {