@ozdao/prometheus-framework 0.2.188 → 0.2.189

package/src/modules/gallery/components/sections/BackofficeGallery.vue

@@ -162,8 +162,8 @@ import * as organizations from '@pf/src/modules/organizations/store/organization
   
 import gallery from '@pf/src/modules/gallery/store/gallery';
 
-import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
-import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
+import CardHeader  from '@pf/src/modules/globals/views/components/blocks/CardHeader.vue'
+import SectionPageTitle from '@pf/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 
 
 

package/src/modules/gallery/models/photo.model.js

@@ -1,6 +1,6 @@
-const applyCommonSchema = require('@pf/src/modules/globals/models/common.schema.js');
-const applyEngagementSchema = require('@pf/src/modules/globals/models/engagement.schema.js');
-const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+const applyCommonSchema = require('@pf/src/modules/globals/models/schemas/common.schema.js');
+const applyEngagementSchema = require('@pf/src/modules/globals/models/schemas/engagement.schema.js');
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/schemas/ownership.schema.js');
 
 module.exports = (db) => {
   const PhotoSchema = new db.mongoose.Schema({

package/src/modules/gallery/store/gallery.js

@@ -1,4 +1,4 @@
-import Store from '@pf/src/modules/globals/services/globals.store.js'
+import Store from '@pf/src/modules/globals/views/classes/globals.store.js'
 
 const gallery = new Store(`${process.env.API_URL}/api/gallery`)
 

package/src/modules/globals/{services → controllers/classes}/globals.crud.js

@@ -1,7 +1,7 @@
 const globalsQuery = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
-const Cache = require('@pf/src/modules/globals/services/globals.cache');
-const Logger = require('@pf/src/modules/globals/services/globals.logger');
+const Cache = require('@pf/src/modules/globals/controllers/classes/globals.cache');
+const Logger = require('@pf/src/modules/globals/controllers/classes/globals.logger');
 
 class CRUD {
   constructor(basePath, app, db, model) {

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

@@ -1,19 +1,89 @@
 // Components
 // import Client from "./components/layouts/Client.vue"
 
-import getBrowserLocale from './localization/get-browser-locale.js';
-import routerGuards from './router/routerGuards.js';
-import scrollBehavior from './router/scrollBehavior.js';
+import getBrowserLocale from './views/localization/get-browser-locale.js';
+import scrollBehavior from './views/router/scrollBehavior.js';
 
-import * as mixins from './mixins/mixins.js'
-import * as globalStore from './store/globals.js';
+
+import layoutApp from './views/components/layouts/App.vue'
+// import layoutClient from './views/components/layouts/Client.vue'
+
+import * as mixins from './views/mixins/mixins.js'
+import * as storeGlobals from './views/store/globals.js';
 
 export {
   // Client,
   mixins,
-  routerGuards,
   scrollBehavior,
   getBrowserLocale,
-  
-  globalStore
+  // Store
+  storeGlobals,
+  // Components
+  // layoutClient,
+  layoutApp
 };
+
+// Пример функции инициализации для модуля заказов
+function initializeGlobals(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+
+  const envVariables = [
+    'NODE_ENV',
+    'PORT',
+    'APP_NAME',
+    'DOMAIN_URL',
+    'API_URL',
+    'WSS_URL',
+    'FILE_SERVER_URL',
+    'WDT_TOKEN',
+    'WDM_URL_PROD',
+    'GOOGLE_MAPS_API_KEY',
+    'MOBILE_APP'
+  ];
+
+  app.config.globalProperties.DOMAIN_URL = process.env.DOMAIN_URL;
+  app.config.globalProperties.API_URL = process.env.API_URL;
+  app.config.globalProperties.MOBILE_APP = process.env.MOBILE_APP;
+  app.config.globalProperties.FILE_SERVER_URL = process.env.FILE_SERVER_URL;
+  app.config.globalProperties.GOOGLE_MAPS_API_KEY = process.env.GOOGLE_MAPS_API_KEY;
+
+  app
+    .mixin(mixins.globalMixins);
+  
+  router.beforeEach((to, from, next) => {
+    const locale = to.params.locale;
+
+    if (locale) {
+      if (!app.config.globalProperties.$i18n.availableLocales.includes(locale)) {
+        return next({ path: '/404' });
+      } else {
+       app.config.globalProperties.$i18n.locale = locale;
+       return next();
+      }
+    }
+
+    return next();
+    
+  });
+
+  store.addStore('globals', storeGlobals);
+}
+
+const ModuleGlobals = {
+  initialize: initializeGlobals,
+  views: {
+    store: {
+      storeGlobals,
+    },
+    router: {
+      // routerOrders
+    },
+    components: {
+      // Pages
+      // layoutClient,
+      layoutApp
+    }
+  }
+}
+
+export default ModuleGlobals

package/src/modules/globals/globals.server.js

@@ -1,7 +1,7 @@
 // Importing utils
-const sitemap = require('./utils/sitemap.js');
-const mailing = require('./utils/mailing.js');
-const parseCookie = require('./utils/parseCookie.js');
+const sitemap = require('./controllers/utils/sitemap.js');
+const mailing = require('./controllers//utils/mailing.js');
+const parseCookie = require('./controllers/utils/parseCookie.js');
 
 // Since controllers and routes are not specified in your folder structure, they are not imported here.
 

package/src/modules/globals/models/{metadata.schema.js → schemas/metadata.schema.js}

@@ -1,5 +1,5 @@
 // Utils
-const createFriendlyURL = require('@pf/src/modules/globals/utils/seo-friendly-url');
+const createFriendlyURL = require('@pf/src/modules/globals/controllers/utils/seo-friendly-url');
 
 module.exports = function applyMetadataSchema(schema,db) {
   schema.add({

package/src/modules/globals/{services → views/classes}/globals.store.js

@@ -1,7 +1,7 @@
 import { reactive } from 'vue';
 
 // Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
+import { setError }   from '@pf/src/modules/globals/views/store/globals'
 
 class Store {
   constructor(apiUrl) {

package/src/modules/globals/{components → views/components}/blocks/BlockSorting.vue

@@ -3,7 +3,7 @@ import { ref } from 'vue';
 
 import Radio from "@pf/src/components/Radio/Radio.vue";
 
-import ButtonSort  from '@pf/src/modules/globals/components/elements/ButtonSort.vue'
+import ButtonSort  from '@pf/src/modules/globals/views/components/elements/ButtonSort.vue'
 import IconSort from '@pf/src/modules/icons/navigation/IconSort.vue'
 
 const props = defineProps({

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

@@ -0,0 +1,83 @@
+<template>
+  <router-view v-slot="{ Component }">
+    <component :is="Component"/>
+  </router-view>
+</template>
+
+<script setup>
+  import { useHead } from '@unhead/vue'
+  import { useI18n } from 'vue-i18n'
+  import { useRoute } from 'vue-router'
+  import { computed } from 'vue'
+
+  const props = defineProps({
+    messages: {
+      type: Object,
+      required: true
+    },
+  })
+
+  const { t, locale } = useI18n({
+    messages: props.messages
+  })
+
+  const current_url = computed(() => removeTrailingSlash(`${base_url}${route.path}`));
+
+  const route = useRoute();
+
+  const languages = ['en', 'ru'];
+  const base_url = 'https://weeder.delivery';
+
+
+  function removeTrailingSlash(url) {
+    return url.endsWith('/') ? url.slice(0, -1) : url;
+  }
+
+  // Используйте эту функцию, чтобы удалить слэш в конце URL
+  const metadata = computed(() => {return {
+    title: t('meta.title'),
+    description: t('meta.description'),
+    meta: [
+        { charset: 'utf-8' },
+        { name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' },
+        { hid: 'description', name: 'description', content: t('meta.description') },
+        { hid: 'keywords', name: 'keywords', content: t('meta.keywords') },
+        { hid: 'og:title', property: 'og:title', content: t('meta.og.title') },
+        { hid: 'og:description', property: 'og:description', content: t('meta.og.description') },
+        { hid: 'og:image', property: 'og:image', content: base_url + '/favicon/cover.jpg' },
+        { hid: 'og:url', property: 'og:url', content: current_url.value },
+        { hid: 'twitter:title', name: 'twitter:title', content: t('meta.twitter.title') },
+        { hid: 'twitter:description', name: 'twitter:description', content: t('meta.twitter.description') },
+        { hid: 'twitter:image', name: 'twitter:image', content: base_url + '/favicon/cover.jpg' },
+        { hid: 'twitter:card', name: 'twitter:card', content: t('meta.twitter.card') },
+        ],
+    link: [
+        { hid: 'canonical', rel: 'canonical', href: current_url.value },
+        ...generateAlternateLinks.value,
+    ],
+    htmlAttrs: { lang: t('meta.htmlAttrs.lang')}
+  }});
+
+  const generateAlternateLinks = computed(() => {
+    return languages.map(lang => {
+      let newPath = route.path;
+
+      console.log(route)
+
+      if (route.params.locale) {
+        newPath = newPath.replace(`/${route.params.locale}`, `/${lang}`);
+      } else {
+        newPath = `/${lang}${newPath}`;
+      }
+      const href = removeTrailingSlash(`${base_url}${newPath}`);
+      return { 
+        hid: 'alternate', 
+        rel: 'alternate', 
+        hreflang: lang, 
+        href: href
+      };
+    });
+  });
+
+  useHead(metadata.value)
+</script>

package/src/modules/globals/{components → views/components}/layouts/Client.vue

@@ -98,7 +98,7 @@
 				/>
 			</section> -->
 
-			<!-- <Suspense> -->
+			<Suspense>
 				<router-view  v-slot="{ Component, route }">
 					<transition @before-enter="scrollTop" name="scaleIn" mode="out-in" appear>
 		      	<component 
@@ -108,7 +108,7 @@
 		      	/>
 		      </transition>
 				</router-view>
-			<!-- </Suspense> -->
+			</Suspense>
       <!-- <Footer /> -->
 		</section>
 
@@ -134,11 +134,11 @@
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import LocationSelection from '@pf/src/components/LocationSelection/LocationSelection.vue'
 
-	import Header	from '@pf/src/modules/globals/components/partials/Header.vue'
-	import Navigation from '@pf/src/modules/globals/components/partials/Navigation.vue'
-	import Footer from '@pf/src/modules/globals/components/partials/Footer.vue'
-  import NavigationBar from '@pf/src/modules/globals/components/partials/NavigationBar.vue';
-  import BottomNavigation from '@pf/src/modules/globals/components/partials/BottomNavigation.vue';
+	import Header	from '@pf/src/modules/globals/views/components/partials/Header.vue'
+	import Navigation from '@pf/src/modules/globals/views/components/partials/Navigation.vue'
+	import Footer from '@pf/src/modules/globals/views/components/partials/Footer.vue'
+  import NavigationBar from '@pf/src/modules/globals/views/components/partials/NavigationBar.vue';
+  import BottomNavigation from '@pf/src/modules/globals/views/components/partials/BottomNavigation.vue';
 
 	import ShopCart from '@pf/src/modules/orders/components/partials/ShopCart.vue'
 	// Walkthrough
@@ -146,7 +146,7 @@
   
   if (__MOBILE_APP__) {
 	  Walkthrough = defineAsyncComponent(() =>
-	    import('@pf/src/modules/globals/components/sections/Walkthrough.vue').then(_ => _.default)
+	    import('@pf/src/modules/globals/views/components/sections/Walkthrough.vue').then(_ => _.default)
 	  );
   } else {
     Walkthrough = null;

package/src/modules/globals/{components → views/components}/partials/Header.vue

@@ -6,7 +6,7 @@
 	import { useStore } from '@/store';
 	
 	// Globasls Component
-	import Navigation from '@pf/src/modules/globals/components/partials/Navigation.vue'
+	import Navigation from '@pf/src/modules/globals/views/components/partials/Navigation.vue'
 	// Prometheus Component
 	import Button from '@pf/src/components/Button/Button.vue'
 	import Select from '@pf/src/components/Select/Select.vue'

package/src/modules/globals/views/middlewares/localization.js

@@ -0,0 +1,16 @@
+function setLocale(to, from, next) {
+  const locale = to.params.locale;
+
+  if (locale && this.$i18n.availableLocales.includes(locale)) {
+    console.log('true')
+    app.config.globalProperties.$i18n.locale = locale;
+  return next();
+  }
+
+  next();
+}
+
+
+export  {
+  setLocale
+}

package/src/modules/integrations/stripe/controllers/webhooks/stripe.webhook.js

@@ -1,8 +1,8 @@
 // stripeWebhook.js
 const stripe = require('stripe')(process.env.STRIPE_SECRET_KEY);
 
-const Webhook = require('@pf/src/modules/globals/services/globals.webhook');
-const Observer = require('@pf/src/modules/globals/services/globals.observer');
+const Webhook = require('@pf/src/modules/globals/controllers/classes/globals.webhook');
+const Observer = require('@pf/src/modules/globals/controllers/classes/globals.observer');
 
 function middleware(req, res, next) {
   next();

package/src/modules/landing/components/sections/SubscribeNewsletter.vue

@@ -38,7 +38,7 @@ import text from '@pf/src/modules/landing/localization/SubscribeNewsletter.json'
 
 import FieldBig from "@pf/src/components/FieldBig/FieldBig.vue";
 
-import * as globals from '@pf/src/modules/globals/store/globals.js';
+import * as globals from '@pf/src/modules/globals/views/store/globals.js';
 import * as applications from '@pf/src/modules/orders/store/applications.js';
 
 import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'

package/src/modules/marketplace/components/layouts/Marketplace.vue

@@ -47,7 +47,7 @@
 	import { useI18n } from 'vue-i18n'
 
 
-	import BlockFilter  from '@pf/src/modules/globals/components/blocks/BlockFilter.vue'
+	import BlockFilter  from '@pf/src/modules/globals/views/components/blocks/BlockFilter.vue'
 
 	// Accessing router and store
 	const store = useStore()

package/src/modules/marketplace/router/marketplace.js

@@ -1,4 +1,4 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
+import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue'
 import layoutMarketplace from '../components/layouts/Marketplace.vue'
 
 const marketplace = [

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

@@ -218,7 +218,7 @@
 
 	import StatusHistory from '@pf/src/modules/orders/components/blocks/StatusHistory.vue'
 
-	import * as globals 	from '@pf/src/modules/globals/store/globals'
+	import * as globals 	from '@pf/src/modules/globals/views/store/globals'
 	import * as orders 	from '@pf/src/modules/orders/store/orders'
 	import * as products 	from '@pf/src/modules/products/store/products'
 	import * as organizations 	from '@pf/src/modules/organizations/store/organizations'

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

@@ -198,7 +198,7 @@
 	import VueDatePicker from '@vuepic/vue-datepicker';
 	import '@vuepic/vue-datepicker/dist/main.css'
 
-	import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
+	import SectionPageTitle from '@pf/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 
 	import Popup from "@pf/src/components/Popup/Popup.vue";
 
@@ -212,7 +212,7 @@
 
 	import StatusHistory from '@pf/src/modules/orders/components/blocks/StatusHistory.vue'
 
-	import * as globals 	from '@pf/src/modules/globals/store/globals'
+	import * as globals 	from '@pf/src/modules/globals/views/store/globals'
 	import * as orders 	from '@pf/src/modules/orders/store/orders'
 	import * as products 	from '@pf/src/modules/products/store/products'
 	import * as organizations 	from '@pf/src/modules/organizations/store/organizations'

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

@@ -127,7 +127,7 @@ import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.
 import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute,useRouter } from 'vue-router'
 // Store
-import * as globals from '@pf/src/modules/globals/store/globals';
+import * as globals from '@pf/src/modules/globals/views/store/globals';
 import * as auth from '@pf/src/modules/auth/views/store/auth';
 import * as shopcart from '@pf/src/modules/orders/store/shopcart';
 import * as organizations from '@pf/src/modules/organizations/store/organizations';

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

@@ -208,14 +208,14 @@
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
   import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
-  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+  import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
   import FormAddCustomer from '@pf/src/modules/orders/components/sections/FormAddCustomer.vue'
   import FormDelivery from '@pf/src/modules/orders/components/sections/FormDelivery.vue'
   import FormPayment from '@pf/src/modules/orders/components/sections/FormPayment.vue'
 
   // Import your store
-  import * as globals from '@pf/src/modules/globals/store/globals';
+  import * as globals from '@pf/src/modules/globals/views/store/globals';
   import * as auth from '@pf/src/modules/auth/views/store/auth';
   import * as orders from '@pf/src/modules/orders/store/orders';
   import * as products from '@pf/src/modules/products/store/products';

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

@@ -182,9 +182,9 @@
   import * as auth from '@pf/src/modules/auth/views/store/auth';
 
   import CardOrder from '@pf/src/modules/orders/components/blocks/CardOrder.vue'
-  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
+  import CardHeader  from '@pf/src/modules/globals/views/components/blocks/CardHeader.vue'
 
-  import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
+  import SectionPageTitle from '@pf/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
 

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

@@ -85,7 +85,7 @@ import Select from '@pf/src/components/Select/Select.vue'
 import Feed from '@pf/src/components/Feed/Feed.vue'
 import Button from '@pf/src/components/Button/Button.vue'
 
-import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
 import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
@@ -94,7 +94,7 @@ import FormCustomerDetails from '@pf/src/modules/orders/components/sections/Form
 import * as users from '@pf/src/modules/users/store/users';
 import * as auth from '@pf/src/modules/auth/views/store/auth';
 
-import { setError } from '@pf/src/modules/globals/store/globals'
+import { setError } from '@pf/src/modules/globals/views/store/globals'
 
 import customers from '@pf/src/modules/orders/store/customers.store';
 import customerInitState from "@pf/src/modules/orders/store/models/customer"

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

@@ -70,7 +70,7 @@
 
 <script setup>
 import { onMounted } from 'vue'
-import * as globals from '@pf/src/modules/globals/store/globals';
+import * as globals from '@pf/src/modules/globals/views/store/globals';
 import Block from '@pf/src/components/Block/Block.vue'
 import Address from '@pf/src/components/Address/Address.vue'
 import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue";

package/src/modules/orders/controllers/applications.controller.js

@@ -5,7 +5,7 @@ const axios = require('axios');
 // --------------------------------------------------
 // UTILS
 // --------------------------------------------------
-const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/controllers/utils/mailing');
 // --------------------------------------------------
 // METHODS
 // --------------------------------------------------

package/src/modules/orders/controllers/orders.controller.js

@@ -1,6 +1,6 @@
 const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
-const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
+const { sendChatMessageTelegram } = require('@pf/src/modules/globals/controllers/utils/mailing');
 
 function formatPositions(positions) {
   return positions.map(pos => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join('\n');

package/src/modules/orders/models/customer.model.js

@@ -1,6 +1,6 @@
-const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
-const applyProfileSchema = require('@pf/src/modules/globals/models/profile.schema.js');
-const applyCredentialsSchema = require('@pf/src/modules/globals/models/credentials.schema.js');
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/schemas/ownership.schema.js');
+const applyProfileSchema = require('@pf/src/modules/globals/models/schemas/profile.schema.js');
+const applyCredentialsSchema = require('@pf/src/modules/globals/models/schemas/credentials.schema.js');
 
 module.exports = (db) => {
 

package/src/modules/orders/models/order.model.js

@@ -1,4 +1,4 @@
-const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/schemas/ownership.schema.js');
 
 module.exports = (db) => {
     

package/src/modules/orders/orders.server.js

@@ -8,7 +8,7 @@ const RoutesApplications = require('./routes/applications.routes.js');
 
 const FactoryOrder = require('./controllers/orders.controller.js');
 
-const CRUD = require('@pf/src/modules/globals/services/globals.crud');
+const CRUD = require('@pf/src/modules/globals/controllers/classes/globals.crud');
 
 function initializeOrders(app, db, origins, publicPath) {
   // Setup models in the database object

package/src/modules/orders/router/orders.backoffice.router.js

@@ -1,4 +1,4 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
+import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue';
 
 const orders = [
    {

package/src/modules/orders/router/orders.router.js

@@ -1,4 +1,4 @@
-import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
+import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue';
 
 const orders = {
   path: 'orders',

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

@@ -6,7 +6,7 @@ import { reactive, computed, watch  } from "vue";
 // --------------------------------------------------
 // GLOBALS
 // --------------------------------------------------
-import { setError }   from '@pf/src/modules/globals/store/globals'
+import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // --------------------------------------------------
 // AXIOS
 // --------------------------------------------------

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

@@ -1,4 +1,4 @@
-import Store from '@pf/src/modules/globals/services/globals.store.js'
+import Store from '@pf/src/modules/globals/views/classes/globals.store.js'
 
 const customers = new Store(`${process.env.API_URL}/api/customers`)
 

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

@@ -5,7 +5,7 @@ import axios from 'axios';
 // Setup Axios
 const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 // Globals
-import { setError }   from '@pf/src/modules/globals/store/globals'
+import { setError }   from '@pf/src/modules/globals/views/store/globals'
 // Init State
 import orderInitState from "@pf/src/modules/orders/store/models/order"
 

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

@@ -5,7 +5,7 @@ import { reactive, watch, computed  } from "vue";
 // Dependencies
 import Cookies from 'js-cookie'
 // Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
+import { setError }   from '@pf/src/modules/globals/views/store/globals'
 
 /////////////////////////////
 // State

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

@@ -297,7 +297,7 @@ import DepartmentSub from "@pf/src/modules/organizations/components/blocks/Depar
 
 import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
-import * as globals from "@pf/src/modules/globals/store/globals";
+import * as globals from "@pf/src/modules/globals/views/store/globals";
 import * as departments from "@pf/src/modules/organizations/store/departments";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";
 

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

@@ -168,7 +168,7 @@ import Tab      from '@pf/src/components/Tab/Tab.vue'
 import Block      from '@pf/src/components/Block/Block.vue'
 import Popup from '@pf/src/components/Popup/Popup.vue';
 
-import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
+import SectionPageTitle from '@pf/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
 import MembersAdd from '@pf/src/modules/organizations/components/sections/MembersAdd.vue';
@@ -183,7 +183,7 @@ import CardDepartment from '@pf/src/modules/organizations/components/blocks/Card
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
 
 import * as auth      from '@pf/src/modules/auth/views/store/auth'
-import * as globals      from '@pf/src/modules/globals/store/globals'
+import * as globals      from '@pf/src/modules/globals/views/store/globals'
 import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -110,7 +110,7 @@
   import Button   from '@pf/src/components/Button/Button.vue'
   import Feed from '@pf/src/components/Feed/Feed.vue'
 
-  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+  import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
   import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 

package/src/modules/organizations/controllers/invites.controller.js

@@ -1,6 +1,6 @@
 const { uuid } = require('uuidv4');
 
-const { sendEmail, sendSms } = require('@pf/src/modules/globals/utils/mailing');
+const { sendEmail, sendSms } = require('@pf/src/modules/globals/controllers/utils/mailing');
 
 const сontrollerFactory = (db) => {
   const User = db.user;