@ozdao/martyrs 0.2.463 → 0.2.465

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-Q8Dr1-HT.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-DEHjtgLs.mjs";
 import "vue";
 export {
   o as Address,

package/dist/style.css

@@ -296,6 +296,9 @@ button[disabled] {
 }.no-scroll {
   overflow: hidden;
 }
+.no-scroll #view {
+  overflow: hidden;
+}
 .popup-wrapper {
   display: flex;
   position: fixed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.463",
+  "version": "0.2.465",
   "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/BottomSheet/BottomSheet.vue

@@ -3,7 +3,7 @@
     <section 
       v-if="show"
       ref="wrapper" 
-      class="w-100 bs-black rows-1 h-100vh"
+      class="w-100 bs-black rows-1 h-100"
       :class="{
         'pd-t-extra': MOBILE_APP === 'ios',  
       }"
@@ -18,11 +18,9 @@
         @mouseup="endDrag"
         @touchend="endDrag"
         @mouseleave="endDrag"
-        class="bs-black d-block p-medium pos-relative bg-white flex-center flex uppercase z-index-2"
+        class="bs-black pd-small br-b br-solid br-light pos-relative bg-white flex-center flex z-index-2"
       >
-        <div class="radius-extra flex flex-center  pd-small t-black p-medium">
-          <div class="radius-extra pd-nano w-3r h-1r t-black p-medium bg-black-transp-10"></div>
-        </div>
+        <div class="radius-extra pd-nano w-3r h-1r bg-light"></div>
       </div>
       
       <slot></slot>
@@ -31,7 +29,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 
 const props = defineProps({
   show: {
@@ -56,6 +54,14 @@ const startY = ref(0);
 const currentY = ref(0);
 const dragging = ref(false);
 
+watch(() => props.show, (newVal) => {
+  if (newVal) {
+    document.body.classList.add('no-scroll');
+  } else {
+    document.body.classList.remove('no-scroll');
+  }
+});
+
 function startDrag(event) {
   dragging.value = true;
   startY.value = event.touches ? event.touches[0].clientY : event.clientY;

package/src/components/Button/Button.vue

@@ -112,9 +112,9 @@
 			<template v-else-if="loading && !error && showLoader"><Loader  class="pos-relative pos-t-0 pos-l-0 loading"/></template>
 			<!-- <Loader v-else-if="loading && !error && showLoader"/> -->
 			<!-- Success -->
-			<span v-else-if="finished && showSucces" class="t-semi loading t-black">{{text.success}}</span>
+			<span v-else-if="finished && showSucces" class="t-semi t-center w-100  loading t-black">{{text.success}}</span>
 			<!-- Error if not finished -->
-			<span v-else-if="error" class="error">{{ error }}</span>
+			<span v-else-if="error" class="t-center w-100 error">{{ error }}</span>
 		</transition>
 		<!-- Counter -->
 		<p v-if="counter" class="button-counter">{{counter}}</p> 

package/src/components/Feed/Feed.vue

@@ -24,9 +24,9 @@
       <BottomSheet
         :show="filter.active"
         @toggle="() => filter.active = false"
-        class="z-index-10 pos-absolute pos-t-0 pos-r-0"
+        class="z-index-10 pos-fixed pos-r-0"
         :class="{
-          'pos-t-0':  filter.active,
+          'pos-t-4r':  filter.active,
           'pos-t-100': !filter.active
         }"
       >
@@ -34,7 +34,7 @@
           v-model:filter="filter"
           :options="filter.options"
           @click_filter="() => { filter.active = false } "
-          class="h-100 w-100 pd-small bg-light"
+          class="h-100 w-100 pd-small pd-b-5r bg-light"
         />
       </BottomSheet>  
     </template>

package/src/components/Popup/Popup.vue

@@ -72,6 +72,10 @@ const text = {
 <style lang="scss">
 	.no-scroll {
 	  overflow: hidden;
+
+	  #view {
+	  	overflow: hidden;
+	  }
 	}
 
 	.popup-wrapper {

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

@@ -122,6 +122,7 @@
 				/>
 				 <Suspense @resolve="onSuspenseResolved">
 					<router-view  
+						id="view"
 						v-slot="{ Component, route }" 
 						:class="{
 							'scroll-hide': MOBILE_APP,

package/src/modules/icons/navigation/IconInfo.vue

@@ -27,9 +27,7 @@
 	const props = defineProps({
   fill: {
     type: String,
-    default: {
-      position: 'rgb(var(--black))'
-    }
+    default: 'rgb(var(--black))'
   }
 })
 </script>

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

@@ -16,7 +16,6 @@
 			v-if="order.status === true && shopcart.state.positions.length > 0" 
 			:order="order" 
 		/>
-		{{shopcart.state.organization}}
 		<!-- Order Form -->
 		<div
 			v-if="orders.state.current.status !== true && shopcart.state.positions.length > 0" 
@@ -136,6 +135,9 @@ import * as shopcart from '@martyrs/src/modules/orders/store/shopcart';
 import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
 import * as orders from '@martyrs/src/modules/orders/store/orders';
 import * as users from '@martyrs/src/modules/auth/views/store/users';
+
+const emits = defineEmits(['page-loading', 'page-loaded']);
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Variables and computed
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -169,6 +171,8 @@ if (!globals.state.options.orders.allowUnauthenticatedOrders && !auth.state.user
 orders.mutations.resetOrder()
 
 onMounted(async()=> {
+	 emits('page-loading');
+
 	isLocationLoading.value = true
 
 
@@ -188,6 +192,7 @@ onMounted(async()=> {
 	})
 	
  isLocationLoading.value = false
+  emits('page-loaded');
 })
 
 

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

@@ -141,6 +141,7 @@ const actions = {
 
 
   addProductToCart(product, organization, date) {
+    console.log('organization shopcart is', organization)
     const cartItem = state.positions.find(
       (item) => item._id === product._id
     );

package/src/modules/products/components/pages/Product.vue

@@ -20,14 +20,58 @@
         
         <Price :product="product" size="big" class="flex gap-micro flex-center pd-small br-solid br-1px br-black-transp-10 w-max mn-b-medium" />
 
-        <p v-if="product.description && !product.localization < 1 && !recommendation" class="w-100 t-transp mn-b-small">
+        <p v-if="product.description && !product.localization < 1 && !recommendation" class="w-100 mn-b-small">
           {{ product.description }}
         </p>
-        <p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100 t-transp  mn-b-small">
+        <p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100 mn-b-small">
           {{ t('description') }}
         </p>
 
-        <div class="cols-2 mn-b-small w-100 gap-small">
+         <div class="w-max-33r mn-b-medium">
+          <div v-if="product.listing === 'rent'">
+            <button @click="openPopup" class="cursor-pointer pd-small radius-big w-max mobile:w-100 bg-main button">
+              <div class="gap-thin flex flex-center flex-nowrap">
+                <IconShopcartAdd class="i-semi" />
+                <span>{{ t('addtoorder') }}</span>
+              </div>
+            </button>
+            <PopupDateSelector
+              :product="product"
+              :isOpen="isPopupOpen"
+              :showFees="globals.state.options?.orders.showFees"
+              :feesRate="globals.state.options?.orders.feesRate || 0.15"
+              :showVat="globals.state.options?.orders.showVat"
+              :vatRate="globals.state.options?.orders.vatRate || 0"
+              :onConfirm="selectedDates => addToCart(product, selectedDates)"
+              @close="closePopup"
+            />
+          </div>
+          <div v-else>
+            <Button
+              v-if="product.available > 0"
+              :submit="() => addToCart(product, null)"
+              class="h-3r w-max mobile:w-100 bg-main button"
+            >
+              <div class="gap-thin flex flex-center flex-nowrap">
+                <IconShopcartAdd class="i-semi" />
+                <span>{{ t('addtoorder') }}</span>
+              </div>
+            </Button>
+            <div
+              v-else
+              class="flex-center flex uppercase radius-big t-black w-max pd-small t-medium bg-grey h-3r w-100 mn-r-smallbutton"
+            >
+              Out of Stock
+            </div>
+          </div>
+        </div>
+
+        <div class="mn-b-small flex-nowrap flex flex-v-center">
+          <IconInfo class="mn-r-micro i-medium"/>
+          <p class="t-medium ">Product Details</p>
+        </div>
+
+        <div class="cols-2 mn-b-medium w-100 gap-small">
           <div
             v-if="product.information.length > 0"
             v-for="information in product.information"
@@ -38,58 +82,23 @@
           </div>
         </div>
 
-        <p class="t-medium mn-b-small">Provided by</p>
+        <div class="mn-b-small flex-nowrap flex flex-v-center">
+          <IconGroups class="mn-r-micro i-medium"/>
+          <p class="t-medium ">Provided by</p>
+        </div>
+
         <CardOrganization 
           v-if="product.owner"
           :organization="product.owner.target"
           :showRating="true"
           :showFollowers="false"
           :showProducts="false"
-          class="bg-light mn-b-thin w-100 o-hidden radius-medium pd-small "
+          class="bg-light w-100 o-hidden radius-medium pd-small "
         />
 
 
 
-        <div class="w-max-33r">
-          <div class="w-max-33r">
-		        <div v-if="product.listing === 'rent'">
-		          <button @click="openPopup" class="cursor-pointer pd-small radius-big w-max mobile:w-100 bg-main button">
-		            <div class="gap-thin flex flex-center flex-nowrap">
-		              <IconShopcartAdd class="i-semi" />
-		              <span>{{ t('addtoorder') }}</span>
-		            </div>
-		          </button>
-		          <PopupDateSelector
-		            :product="product"
-		            :isOpen="isPopupOpen"
-		            :showFees="globals.state.options?.orders.showFees"
-                :feesRate="globals.state.options?.orders.feesRate || 0.15"
-                :showVat="globals.state.options?.orders.showVat"
-                :vatRate="globals.state.options?.orders.vatRate || 0"
-		            :onConfirm="selectedDates => addToCart(product, selectedDates)"
-		            @close="closePopup"
-		          />
-		        </div>
-	          <div v-else>
-	            <Button
-	              v-if="product.available > 0"
-	              :submit="() => addToCart(product, null)"
-	              class="h-3r w-max mobile:w-100 bg-main button"
-	            >
-	              <div class="gap-thin flex flex-center flex-nowrap">
-	                <IconShopcartAdd class="i-semi" />
-	                <span>{{ t('addtoorder') }}</span>
-	              </div>
-	            </Button>
-	            <div
-	              v-else
-	              class="flex-center flex uppercase radius-big t-black w-max pd-small t-medium bg-grey h-3r w-100 mn-r-smallbutton"
-	            >
-	              Out of Stock
-	            </div>
-	          </div>
-	        </div>
-        </div>
+       
       </div>
     </div>
 
@@ -117,8 +126,14 @@ import Popup from '@martyrs/src/components/Popup/Popup.vue'
 import Tab from '@martyrs/src/components/Tab/Tab.vue'
 import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
 import PopupDateSelector from '@martyrs/src/modules/globals/views/components/blocks/PopupDateSelector.vue'
+
 import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
+
+import IconInfo from '@martyrs/src/modules/icons/navigation/IconInfo.vue'
+import IconGroups from '@martyrs/src/modules/icons/entities/IconGroups.vue'
+
+
 import ImagesThumbnails from '@martyrs/src/modules/products/components/blocks/ImagesThumbnails.vue'
 import Price from '@martyrs/src/modules/products/components/elements/Price.vue'
 import PopularProducts from '@martyrs/src/modules/products/components/sections/PopularProducts.vue'
@@ -177,22 +192,25 @@ function validateToCard(product) {
 async function addToCart(product, selectedDates = null) {
   try {
     // Если организация товара отличается от текущей в корзине
-    if (shopcart.state.organization && shopcart.state.organization !== product.owner.target) {
+    if (shopcart.state.organization && shopcart.state.organization !== product.owner.target._id) {
       const result = await proxy.$alert({
         title: 'Replace items in your cart?',
         message: `Your cart has items from another vendor. If you continue, we'll clear it so you can order from this one instead.`,
         actions: [
           { label: 'Cancel', value: false },
-          { label: 'Start New Order', value: true }
+          { label: 'Replace', value: true }
         ]
       })
 
       if (!result) throw error
 
-      shopcart.state.organization = product.owner.target._id
+     shopcart.state.organization = product.owner.target._id
       shopcart.state.positions = []
     }
 
+   
+
+    console.log('organization is', product.owner.target._id)
     await shopcart.actions.addProductToCart(product, product.owner.target._id, selectedDates)
     return true
   } catch (error) {