@ozdao/martyrs 0.2.550 → 0.2.552

package/src/modules/orders/components/elements/FieldSubscribeNewsletter.vue

@@ -61,9 +61,11 @@ import IconYoutube from '@martyrs/src/modules/icons/socials/youtube.vue'
 import IconLinkedin from '@martyrs/src/modules/icons/socials/linkedin.vue'
 import IconWhatsapp from '@martyrs/src/modules/icons/socials/whatsapp.vue'
 
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
 import applications from '@martyrs/src/modules/orders/store/applications.js'
 
+const store = useStore()
+
 const props = defineProps({
   // Тексты компонента
   title: {
@@ -148,12 +150,12 @@ function showSuccessPopup() {
 async function sendApplication() {
   // Валидация email перед отправкой
   if (!email.value || !email.value.trim()) {
-    core.setError({ message: t('validation.email.required') || 'Email is required' })
+    store.core.setError({ message: t('validation.email.required') || 'Email is required' })
     return Promise.reject(new Error('Email is required'))
   }
 
   if (!validateEmail(email.value.trim())) {
-    core.setError({ message: t('validation.email.invalid') || 'Invalid email format' })
+    store.core.setError({ message: t('validation.email.invalid') || 'Invalid email format' })
     return Promise.reject(new Error('Invalid email format'))
   }
 
@@ -189,7 +191,7 @@ async function sendApplication() {
     return Promise.resolve(result);
   } catch (error) {
     console.log(error)
-    core.setError(error)
+    store.core.setError(error)
     return Promise.reject(error);
   }
 }

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

@@ -9,7 +9,7 @@
 			</div>
 
 	  	<div class="flex-nowrap flex gap-thin pos-relative ">
-		    <div v-for="(status, index) in core.state.options.orders.statuses" :key="index" class="w-20">
+		    <div v-for="(status, index) in store.core.state.options.orders.statuses" :key="index" class="w-20">
 		      <div
 		      	class="bg-white br-anim br-glow radius-extra h-1r w-100"
 		        :class="
@@ -96,13 +96,13 @@
   			/>
       </ul>
       
-      <PriceTotal 
+      <PriceTotal
         :totalPrice="cartTotalPrice"
         :currency="returnCurrency()"
-        :showFees="core.state.options?.orders?.showFees"
-        :feesRate="core.state.options?.orders?.feesRate || 0"
-        :showVat="core.state.options?.orders?.showVat"
-        :vatRate="core.state.options?.orders?.vatRate || 0"
+        :showFees="store.core.state.options?.orders?.showFees"
+        :feesRate="store.core.state.options?.orders?.feesRate || 0"
+        :showVat="store.core.state.options?.orders?.showVat"
+        :vatRate="store.core.state.options?.orders?.vatRate || 0"
       />
 
     	<Button :submit="setNextStatus"  class="t-white w-100 bg-second">
@@ -264,15 +264,15 @@
 	  			/>
 	      </ul>
 	      
-	      <PriceTotal 
+	      <PriceTotal
           :totalPrice="cartTotalPrice"
           :deliveryRate="deliveryCost"
           :currency="returnCurrency()"
-          :showFees="core.state.options?.orders?.showFees"
-          :feesRate="core.state.options?.orders?.feesRate || 0"
-          :showVat="core.state.options?.orders?.showVat"
-          :vatRate="core.state.options?.orders?.vatRate || 0"
-				  :showDeliveryFee="core.state.options?.orders.showDeliveryFee"
+          :showFees="store.core.state.options?.orders?.showFees"
+          :feesRate="store.core.state.options?.orders?.feesRate || 0"
+          :showVat="store.core.state.options?.orders?.showVat"
+          :vatRate="store.core.state.options?.orders?.vatRate || 0"
+				  :showDeliveryFee="store.core.state.options?.orders.showDeliveryFee"
 
         />
      	</div>
@@ -304,7 +304,7 @@
 	import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue';
 	import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
-	import * as globals 	from '@martyrs/src/modules/core/views/store/core.store.js'
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 	import * as orders 	from '@martyrs/src/modules/orders/store/orders.js'
 	import * as products 	from '@martyrs/src/modules/products/store/products.js'
@@ -312,6 +312,8 @@
 
 	import { useI18n } from 'vue-i18n';
 	import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+
+	const store = useStore()
 	
 	const { locale } = useI18n();
 	const { returnCurrency } = useGlobalMixins();
@@ -323,7 +325,7 @@
 	const productsOrganization = ref(null)
 	const orderOrganization = ref(null)
 
-	const statuses = core.state.options.orders.statuses
+	const statuses = store.core.state.options.orders.statuses
 	const statusLabels = ['Created', 'Confirmed', 'Preparing', 'In use', 'Finished'];
 
   if (route.meta.context === 'user' && 
@@ -371,7 +373,7 @@
 
 	  orderOrganization.value = await organizations.actions.read({
 	    _id: order.value?.owner.target._id,
-	    location: core.state.position?.location,
+	    location: store.core.state.position?.location,
 	    lookup: ['spots']
 	  });
 
@@ -381,7 +383,7 @@
 const deliveryCost = computed(() => {
   const type = orders.state.current.delivery.type
   const distance = orderOrganization.value[0]?.distance || 0
-  const config = core.state.options?.orders?.delivery_formula || {}
+  const config = store.core.state.options?.orders?.delivery_formula || {}
 
   return orders.getters.getDeliveryPrice(type, distance, config)
 })
@@ -417,16 +419,16 @@ const deliveryCost = computed(() => {
 
 
 	function getNextStatus(currentStatus) {
-	  const currentIndex = core.state.options.orders.statuses.findIndex(status => status.value === currentStatus);
+	  const currentIndex = store.core.state.options.orders.statuses.findIndex(status => status.value === currentStatus);
 
 	  if (currentIndex !== -1 && currentIndex + 1 < statuses.length) {
-	    return core.state.options.orders.statuses[currentIndex + 1];
+	    return store.core.state.options.orders.statuses[currentIndex + 1];
 	  }
 	  return null; // If next status doesn't exist
 	}
 
 	const isActiveStatus = (index) => {
-	  return core.state.options.orders.statuses.slice(index).some(status => status.value === order.value.status);
+	  return store.core.state.options.orders.statuses.slice(index).some(status => status.value === order.value.status);
 	};
 
   async function changePaymentStatus() {

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

@@ -83,11 +83,11 @@
           :totalPrice="cartTotalPrice"
           :deliveryRate="deliveryCost"
           :currency="returnCurrency()"
-          :showFees="core.state.options?.orders.showFees"
-          :feesRate="core.state.options?.orders.feesRate || 0"
-          :showVat="core.state.options?.orders.showVat"
-          :vatRate="core.state.options?.orders.vatRate || 0"
-          :showDeliveryFee="core.state.options?.orders.showDeliveryFee"
+          :showFees="store.core.state.options?.orders.showFees"
+          :feesRate="store.core.state.options?.orders.feesRate || 0"
+          :showVat="store.core.state.options?.orders.showVat"
+          :vatRate="store.core.state.options?.orders.vatRate || 0"
+          :showDeliveryFee="store.core.state.options?.orders.showDeliveryFee"
         />
 			</div>
 			<!-- Send order -->
@@ -151,13 +151,14 @@ import { useRoute,useRouter } from 'vue-router'
 import { useGlobalMixins } from "@martyrs/src/modules/core/views/mixins/mixins.js"
 
 // Store
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js';
 import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
 import * as orders from '@martyrs/src/modules/orders/store/orders.js';
 import * as users from '@martyrs/src/modules/auth/views/store/users.js';
 
+const store = useStore()
 const emits = defineEmits(['page-loading', 'page-loaded']);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -177,7 +178,7 @@ const cartTotalPrice = shopcart.getters.cartTotalPrice
 const deliveryCost = computed(() => {
   const type = orders.state.current.delivery.type
   const distance = orderOrganization.value[0]?.distance || 0
-  const config = core.state.options?.orders?.delivery_formula || {}
+  const config = store.core.state.options?.orders?.delivery_formula || {}
 
   return orders.getters.getDeliveryPrice(type, distance, config)
 })
@@ -238,8 +239,8 @@ function checkIsOpenNow(worktime) {
 }
 
 
-if (!core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id) { 
-	router.push({name: 'Sign In'})	
+if (!store.core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id) {
+	router.push({name: 'Sign In'})
 }
 
 
@@ -260,7 +261,7 @@ onMounted(async()=> {
 	
 	orderOrganization.value = await organizations.actions.read({
 	  _id: shopcart.state.organization,
-	  location: core.state.position?.location,
+	  location: store.core.state.position?.location,
 	  lookup: ['spots']
 	})
 	
@@ -290,7 +291,7 @@ onMounted(async()=> {
         item_brand: orderOrganization.value.profile?.name || ''
       })),
       organization: orderOrganization.value.profile?.name || '',
-      location: core.state.position?.location || 'unknown'
+      location: store.core.state.position?.location || 'unknown'
     });
   }
 })
@@ -400,7 +401,7 @@ async function handleCreate() {
 	        item_category: item.product?.category || ''
 	      })),
 	      organization: orderOrganization.value?.profile?.name,
-	      location: core.state.position?.location || 'unknown',
+	      location: store.core.state.position?.location || 'unknown',
 	      referral_code: referralCode || null,
 	      user_id: auth.state.user._id || 'anonymous'
 	    });

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

@@ -218,7 +218,7 @@
   import FormPayment from '@martyrs/src/modules/orders/components/sections/FormPayment.vue'
 
   // Import your store
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as orders from '@martyrs/src/modules/orders/store/orders.js';
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
@@ -226,8 +226,10 @@
   import variants from '@martyrs/src/modules/products/store/variants.store.js';
 
   import customers from '@martyrs/src/modules/orders/store/customers.store';
-  
+
   import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+
+  const store = useStore()
 	
   // Accessing router
   const route = useRoute()
@@ -326,8 +328,8 @@
         variant: variant._id,
         org_id: route.params._id
       };
-      
-      core.actions.add(orders.state.current.positions, position);
+
+      store.core.actions.add(orders.state.current.positions, position);
       closeVariantsPopup();
     } catch (error) {
       console.error('Error adding variant to order:', error);

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

@@ -41,13 +41,13 @@
     <!-- ---------------------------------------------------------------- -->
     <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 
+       <PriceTotal
           :totalPrice="cartTotalPrice"
           :currency="returnCurrency()"
-          :showFees="core.state.options?.orders.showFees"
-          :feesRate="core.state.options?.orders.feesRate"
-          :showVat="core.state.options?.orders.showVat"
-          :vatRate="core.state.options?.orders.vatRate"
+          :showFees="store.core.state.options?.orders.showFees"
+          :feesRate="store.core.state.options?.orders.feesRate"
+          :showVat="store.core.state.options?.orders.showVat"
+          :vatRate="store.core.state.options?.orders.vatRate"
         />
       </div>
       <button v-if="shopcart.state.positions.length > 0" @click="openOrder()" class="bg-main t-black w-100 button">{{ t('fastorder') }}</button>
@@ -87,13 +87,14 @@
 
   import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as shopcart from '@martyrs/src/modules/orders/store/shopcart.js';
   import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
   /////////////////////////////
   // CREATED
   /////////////////////////////
+  const store = useStore()
   const route = useRoute()
   const router = useRouter()
   const { returnCurrency } = useGlobalMixins()
@@ -139,7 +140,7 @@
   function openOrder() {
     // store.dispatch("shopcart/toggleShopCart");
     // store.dispatch("shopcart/setSearch");
-    !core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id ?  router.push({name: 'Sign In', query: { returnUrl: '/orders/form'}}) :   router.push({name: 'CreateOrder'}) 
+    !store.core.state.options.orders.allowUnauthenticatedOrders && !auth.state.user._id ?  router.push({name: 'Sign In', query: { returnUrl: '/orders/form'}}) :   router.push({name: 'CreateOrder'})
     shopcart.actions.toggleShopcart();
   }
 </script>

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

@@ -73,15 +73,17 @@ import { watch, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
-import CardSpot from '@martyrs/src/modules/spots/components/blocks/CardSpot.vue';  
+import CardSpot from '@martyrs/src/modules/spots/components/blocks/CardSpot.vue';
 import * as spotsModule from '@martyrs/src/modules/spots/store/spots.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
 import Block from '@martyrs/src/components/Block/Block.vue';
 import Address from '@martyrs/src/components/Address/Address.vue';
 import LocationMarker from '@martyrs/src/components/LocationMarker/LocationMarker.vue';
 import Radio from '@martyrs/src/components/Radio/Radio.vue';
 import Field from '@martyrs/src/components/Field/Field.vue';
 
+const store = useStore()
+
 const props = defineProps({
   order: Object,
   organization: Object,
@@ -96,11 +98,11 @@ watch(() => props.order.delivery.type, (newType) => {
   }
 });
 
-// Устанавливаем начальные данные из globals при монтировании
+// Устанавливаем начальные данные из store при монтировании
 onMounted(() => {
-  if (core.state.position) {
-    props.order.delivery.address = core.state.position.address;
-    props.order.delivery.location = core.state.position.location;
+  if (store.core.state.position) {
+    props.order.delivery.address = store.core.state.position.address;
+    props.order.delivery.location = store.core.state.position.location;
   }
 });
 

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

@@ -32,7 +32,7 @@ import Succes from './components/sections/Succes.vue';
 // Importing partials components
 import ShopCart from './components/partials/ShopCart.vue';
 
-import { i18nManager } from '@martyrs/src/modules/core/views/classes/core.i18n.js';
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js';
 import locales from './locales/index.js';
 
 // Пример функции инициализации для модуля заказов

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

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const applications = new Store(`${process.env.API_URL}/api/applications`);
+const applications = new StoreManager(`${process.env.API_URL}/api/applications`);
 
 export default applications;

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

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const customers = new Store(`${process.env.API_URL}/api/customers`);
+const customers = new StoreManager(`${process.env.API_URL}/api/customers`);
 
 export default customers;

package/src/modules/organizations/CLAUDE.md

@@ -218,11 +218,11 @@ Request related data using query parameters:
 All stores use the Store class from `@martyrs/src/modules/core/views/classes/core.store.js`:
 
 ```javascript
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const membershipsStore = new Store('/api/memberships');
-const departmentsStore = new Store('/api/departments');
-const invitesStore = new Store('/api/invites');
+const membershipsStore = new StoreManager('/api/memberships');
+const departmentsStore = new StoreManager('/api/departments');
+const invitesStore = new StoreManager('/api/invites');
 ```
 
 #### membershipsStore.handleMembershipUpdate

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -95,8 +95,8 @@
 
     <div v-if="showProducts && organization.products?.length > 0" class="w-100 o-scroll scroll-hide radius-medium">
       <div class="w-max flex-nowrap flex gap-thin">
-        <CardOrderItem  
-          @click.stop="$router.push({name: 'Organization_Product', params: {_id: organization._id, product: product._id}})" 
+        <CardOrderItem
+          @click.stop="$router.push(`/organizations/${organization._id}/products/${product._id}`)"
           v-for="product in organization.products.slice(0,5)" 
           :key="product._id" 
           :editable="false" 

package/src/modules/organizations/components/forms/AddExistingMembersForm.vue

@@ -83,7 +83,9 @@ import IconCheck from '@martyrs/src/modules/icons/navigation/IconCheck.vue';
 
 import * as users from '@martyrs/src/modules/auth/views/store/users.js';
 import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 
 const props = defineProps({
   organizationId: {
@@ -128,7 +130,7 @@ function getUserCardClass(user) {
 // Toggle user selection
 function toggleUserSelection(user) {
   if (isUserInOrganization(user)) {
-    core.actions.setError({ message: 'This user is already a member of the organization' });
+    store.core.actions.setError({ message: 'This user is already a member of the organization' });
     return;
   }
 
@@ -179,13 +181,13 @@ async function addSelectedUsers() {
     emit('users-added', results);
     selectedUsers.value = [];
     
-    core.actions.setSuccess({ 
+    store.core.actions.setSuccess({ 
       message: `Successfully added ${results.length} user(s) to the organization` 
     });
   } catch (error) {
     console.error('Error adding users:', error);
-    core.actions.setError(error);
+    store.core.actions.setError(error);
     throw error;
   }
 }
-</script>
+</script>

package/src/modules/organizations/components/forms/DepartmentForm.vue

@@ -193,7 +193,9 @@ import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue';
 import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
 
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js';
 import departmentsStore from '@martyrs/src/modules/organizations/store/departments.store.js';
 
@@ -330,7 +332,7 @@ function addMemberToDepartment(user) {
     });
     closeMemberPopup();
   } else {
-    core.actions.setError({ message: 'This user is already a member of this department' });
+    store.core.actions.setError({ message: 'This user is already a member of this department' });
   }
 }
 
@@ -370,7 +372,7 @@ async function saveDepartment() {
     emit('close');
   } catch (error) {
     console.error('Error saving department:', error);
-    core.actions.setError(error);
+    store.core.actions.setError(error);
     throw error;
   }
 }
@@ -383,8 +385,8 @@ async function onDelete() {
       emit('close');
     } catch (error) {
       console.error('Error deleting department:', error);
-      core.actions.setError(error);
+      store.core.actions.setError(error);
     }
   }
 }
-</script>
+</script>

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

@@ -220,7 +220,9 @@ import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
 
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 
 const route = useRoute();
 const router = useRouter();
@@ -362,4 +364,4 @@ async function removeInvite(index, invite) {
 </script>
 
 <style scoped>
-</style>
+</style>

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

@@ -133,7 +133,7 @@
 		</section>
 		
 		<!-- Backoffice -->
-		<div v-if="MOBILE_APP" @click="() => core.state.isOpenSidebar = !core.state.isOpenSidebar"  class="pos-relative">
+		<div v-if="MOBILE_APP" @click="() => store.core.state.isOpenSidebar = !store.core.state.isOpenSidebar"  class="pos-relative">
 			<div class="bg-light radius-medium pd-medium">
 				<p class="t-medium t-black-transp-60">
 					Show Menu
@@ -190,7 +190,9 @@
 	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 core from '@martyrs/src/modules/core/views/store/core.store.js'
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+
+const store = useStore();
 
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
 	import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js';

package/src/modules/organizations/organizations.client.js

@@ -1,13 +1,25 @@
+// [LOADING 35] Organizations module import started
+performance.mark('loading-35-start');
+console.log('[LOADING 35] Organizations module import started...');
+
 // Functional imports (needed for initialize function)
 import departmentsStore from './store/departments.store.js';
 import invitesStore from './store/invites.store.js';
 import membershipsStore from './store/memberships.store.js';
 import * as storeOrganizations from './store/organizations.js';
 
+performance.mark('loading-35-stores-end');
+const storesTime = performance.measure('loading-35-stores', 'loading-35-start', 'loading-35-stores-end');
+console.log(`[LOADING 35] Store imports completed in ${storesTime.duration.toFixed(2)}ms`);
+
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
 import { getRoutes } from './organizations.router.js';
 
+performance.mark('loading-35-router-end');
+const routerTime = performance.measure('loading-35-router', 'loading-35-stores-end', 'loading-35-router-end');
+console.log(`[LOADING 35] Router imports completed in ${routerTime.duration.toFixed(2)}ms`);
+
 // Component re-exports (enables tree shaking)
 // Pages
 export { default as Department } from './components/pages/Department.vue';
@@ -75,4 +87,10 @@ const ModuleOrganization = {
   },
 };
 
+// [LOADING 35] Organizations module import completed
+performance.mark('loading-35-end');
+performance.measure('loading-35-total', 'loading-35-start', 'loading-35-end');
+const totalTime = performance.getEntriesByName('loading-35-total')[0];
+console.log(`[LOADING 35] Organizations module fully imported in ${totalTime?.duration?.toFixed(2)}ms`);
+
 export default ModuleOrganization;

package/src/modules/organizations/store/departments.store.js

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const departmentsStore = new Store('/api/departments');
+const departmentsStore = new StoreManager('/api/departments');
 
 export default departmentsStore;

package/src/modules/organizations/store/invites.store.js

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const invitesStore = new Store('/api/invites');
+const invitesStore = new StoreManager('/api/invites');
 
 export default invitesStore;

package/src/modules/organizations/store/memberships.store.js

@@ -1,6 +1,6 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const membershipsStore = new Store('/api/memberships');
+const membershipsStore = new StoreManager('/api/memberships');
 
 // Add handleMembershipUpdate method
 membershipsStore.handleMembershipUpdate = function(user, membership, status, target, statusName, statusNumber) {

package/src/modules/pages/views/store/pages.store.js

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const pages = new Store(`${process.env.API_URL}/api/pages`);
+const pages = new StoreManager(`${process.env.API_URL}/api/pages`);
 
 export default pages;

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

@@ -68,13 +68,14 @@
   import { onMounted, onUnmounted, computed, ref,reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
 
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'; 
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as categories from '@martyrs/src/modules/products/store/categories.js';
-  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'; 
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 
   const route = useRoute();
   const router = useRouter();
+  const store = useStore();
   const { hasAccess } = useGlobalMixins();
 
   import Button from "@martyrs/src/components/Button/Button.vue";
@@ -103,7 +104,7 @@
     }]
   })
 
-  core.state.navigation_bar.actions = [{
+  store.core.state.navigation_bar.actions = [{
     component: IconPlus,
     props: {
       fill: "rgb(var(--main))"
@@ -116,7 +117,7 @@
   }],
 
   onUnmounted(() => {
-    core.state.navigation_bar.actions = [];
+    store.core.state.navigation_bar.actions = [];
   });
 
   onMounted(async () => {