@ozdao/martyrs 0.2.511 → 0.2.513

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

@@ -5,6 +5,8 @@ import { computed, reactive, watch } from 'vue';
 // Dependencies
 // Globals
 import { setError, setSnack } from '@martyrs/src/modules/globals/views/store/globals.js';
+// Capacitor Preferences
+import { Preferences } from '@capacitor/preferences';
 
 /////////////////////////////
 // State
@@ -19,14 +21,18 @@ const state = reactive({
 // Helpers
 /////////////////////////////
 const helpers = {
-  saveToStorage() {
-    localStorage.setItem(
-      CART_STORAGE_KEY,
-      JSON.stringify({
-        positions: state.positions,
-        organization: state.organization,
-      })
-    );
+  async saveToStorage() {
+    try {
+      await Preferences.set({
+        key: CART_STORAGE_KEY,
+        value: JSON.stringify({
+          positions: state.positions,
+          organization: state.organization,
+        })
+      });
+    } catch (error) {
+      console.warn('Could not save cart to preferences:', error);
+    }
   },
 
   async validateProduct(product) {
@@ -75,7 +81,7 @@ async function syncWithServer() {
 
     if (invalidProducts.length > 0) {
       state.positions = state.positions.filter(product => !invalidProducts.includes(product._id));
-      helpers.saveToStorage();
+      await helpers.saveToStorage();
       setError('Some products were removed from cart due to changes on server');
     }
   } catch (error) {
@@ -105,9 +111,10 @@ const actions = {
     state.currentState = state.currentState ? false : true;
   },
 
-  setShopcart() {
+  async setShopcart() {
     try {
-      const storedShopcart = localStorage.getItem('shopcart');
+      const result = await Preferences.get({ key: 'shopcart' });
+      const storedShopcart = result.value;
 
       if (storedShopcart) {
         const shopcartData = JSON.parse(storedShopcart);
@@ -120,7 +127,7 @@ const actions = {
     }
   },
 
-  addProductToCart(product, variant, organization, date, quantity = 1) {
+  async addProductToCart(product, variant, organization, date, quantity = 1) {
     console.log('Adding product with variant to cart', { product: product._id, variant: variant._id, quantity });
     
     // Убедимся, что организация установлена
@@ -148,8 +155,8 @@ const actions = {
       });
     }
 
-    // Сохраняем в localStorage
-    helpers.saveToStorage();
+    // Сохраняем в Preferences
+    await helpers.saveToStorage();
     
     // Отправляем уведомление
     setSnack('Product added to cart');
@@ -157,7 +164,7 @@ const actions = {
 
 
 
-  removeProduct(productId, variantId = null) {
+  async removeProduct(productId, variantId = null) {
     const cartItemIndex = state.positions.findIndex(item => {
       if (variantId) {
         return item._id === productId && item.variant === variantId;
@@ -167,11 +174,11 @@ const actions = {
 
     if (cartItemIndex > -1) {
       state.positions.splice(cartItemIndex, 1);
-      helpers.saveToStorage();
+      await helpers.saveToStorage();
     }
   },
 
-  decrementItemQuantity(productId, variantId = null) {
+  async decrementItemQuantity(productId, variantId = null) {
     const cartItem = state.positions.find(item => {
       if (variantId) {
         return item._id === productId && item.variant === variantId;
@@ -187,11 +194,11 @@ const actions = {
         state.positions.splice(index, 1);
       }
 
-      helpers.saveToStorage();
+      await helpers.saveToStorage();
     }
   },
 
-  incrementItemQuantity(productId, variantId = null) {
+  async incrementItemQuantity(productId, variantId = null) {
     const cartItem = state.positions.find(item => {
       if (variantId) {
         return item._id === productId && item.variant === variantId;
@@ -201,11 +208,11 @@ const actions = {
 
     if (cartItem) {
       cartItem.quantity++;
-      helpers.saveToStorage();
+      await helpers.saveToStorage();
     }
   },
 
-  updateRentDates({ productId, variantId, dates }) {
+  async updateRentDates({ productId, variantId, dates }) {
     const product = state.positions.find(p => p._id === productId && p.variant === variantId);
 
     if (product) {
@@ -215,10 +222,14 @@ const actions = {
     helpers.saveToStorage();
   },
 
-  resetShopcart() {
+  async resetShopcart() {
     state.positions = [];
 
-    localStorage.removeItem('shopcart');
+    try {
+      await Preferences.remove({ key: 'shopcart' });
+    } catch (error) {
+      console.warn('Could not remove cart from preferences:', error);
+    }
   },
 };
 

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';

package/src/modules/organizations/configs/navigation.organization.config.js

@@ -70,42 +70,42 @@ export const navigationItems = [
         }),
         visible: () => true // Public access
       },
-      {
-        title: 'Events',
-        iconComponent: IconEvents,
-        route: (auth, route) => ({
-          name: 'Organization_Events',
-          params: { _id: route.params._id }
-        }),
-        visible: () => true // Public access
-      },
-      {
-        title: 'Posts',
-        iconComponent: IconCommunity,
-        route: (auth, route) => ({
-          name: 'Organization_Posts',
-          params: { _id: route.params._id }
-        }),
-        visible: () => true // Public access
-      },
-      {
-        title: 'Spots',
-        iconComponent: IconAddress,
-        route: (auth, route) => ({
-          name: 'Organization_Spots',
-          params: { _id: route.params._id }
-        }),
-        visible: () => true // Public access
-      },
-      {
-        title: 'Gallery',
-        iconComponent: IconGallery,
-        route: (auth, route) => ({
-          name: 'Backoffice Gallery',
-          params: { _id: route.params._id }
-        }),
-        visible: () => true // Public access
-      },
+      // {
+      //   title: 'Events',
+      //   iconComponent: IconEvents,
+      //   route: (auth, route) => ({
+      //     name: 'Organization_Events',
+      //     params: { _id: route.params._id }
+      //   }),
+      //   visible: () => true // Public access
+      // },
+      // {
+      //   title: 'Posts',
+      //   iconComponent: IconCommunity,
+      //   route: (auth, route) => ({
+      //     name: 'Organization_Posts',
+      //     params: { _id: route.params._id }
+      //   }),
+      //   visible: () => true // Public access
+      // },
+      // {
+      //   title: 'Spots',
+      //   iconComponent: IconAddress,
+      //   route: (auth, route) => ({
+      //     name: 'Organization_Spots',
+      //     params: { _id: route.params._id }
+      //   }),
+      //   visible: () => true // Public access
+      // },
+      // {
+      //   title: 'Gallery',
+      //   iconComponent: IconGallery,
+      //   route: (auth, route) => ({
+      //     name: 'Backoffice Gallery',
+      //     params: { _id: route.params._id }
+      //   }),
+      //   visible: () => true // Public access
+      // },
     ]
   },
   {

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

@@ -447,18 +447,20 @@
     });
   };
 
-  globals.state.navigation_bar.actions = [{
-    component: IconPlus,
-    props: {
-      fill: "rgb(var(--main))" 
-    },
-    condition: () => auth.state.user && auth.state.user._id,
-    action: () => route.params._id ? router.push({ name: 'Organization_ProductAdd', params: { _id: route.params._id} }) : router.push({ name: 'ProductAdd' })
-  }],
+  if (route.params?._id) {
+    globals.state.navigation_bar.actions = [{
+      component: IconPlus,
+      props: {
+        fill: "rgb(var(--main))" 
+      },
+      condition: () => auth.state.user && auth.state.user._id,
+      action: () => route.params._id ? router.push({ name: 'Organization_ProductAdd', params: { _id: route.params._id} }) : router.push({ name: 'ProductAdd' })
+    }];
+  }
 
   onMounted(async () => {
     await loadCategoryData();
-  })
+  });
 
   onUnmounted(() => {
     globals.state.navigation_bar.actions = [];

package/src/modules/products/migrations/categories-to-materialized-path.js

@@ -138,9 +138,6 @@ const migrateCategoriesToMaterializedPath = async (db, testMode = false) => {
               path: ancestors,
               level: level
             },
-            $unset: {
-              url: "" // Удаляем старое поле url
-            }
           }
         );
         

package/src/styles/base/backgrounds.scss

@@ -23,6 +23,7 @@ body {
 	.bg-blur-small 		{ backdrop-filter: blur(var(--small)) 	}
 	.bg-blur-thin 		{ backdrop-filter: blur(var(--thin)) 		}
 	// Other
+	.bg-black-grad { background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(0, 0, 0, 1) 100%); }
 	.bg-grad-main { background: radial-gradient(84.52% 84.52% at 50% 50%, rgb(var(--main)) 23.39%, #E7FFF4 100%), #E8FFF3;}
 	// Transpatrens
 	.bg-t-white 	{ background: rgba(var(--white),0.1); 		}

package/dist/martyrs/src/components/Menu/Menu.vue.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Menu/Menu.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;"}