@ozdao/prometheus-framework 0.2.187 → 0.2.189

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/globals/views/router/scrollBehavior.js

@@ -0,0 +1,30 @@
+export default async function scrollBehavior(to, from, savedPosition) {
+  if (to.hash) {
+    const findEl = async (hash, x) => {
+      return document.querySelector(hash) ||
+        new Promise((resolve, reject) => {
+          if (x > 50) {
+            return resolve()
+          }
+          setTimeout(() => { resolve(findEl(hash, ++x || 1)) }, 1000)
+        })
+    }
+
+    if (to.hash) {
+      let el = await findEl(to.hash)
+      let screen = await findEl('#screen')
+      
+      if ('scrollBehavior' in document.documentElement.style) {
+        return screen.scrollTo({ top: el.offsetTop, behavior: 'smooth' })
+      } else {
+        return screen.scrollTo(0, el.offsetTop)
+      }
+    }
+  } else if (to.matched.some(m => m.meta.scrollTo)) {
+    return { top: m.meta.scrollTo.top, left: m.meta.scrollTo.left }
+  } else if (savedPosition) {
+    return { savedPosition }
+  } else {
+    return { top: 0 }
+  }
+}

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

@@ -1,7 +1,7 @@
 // Vue modules
 import { reactive, computed } from "vue";
 
-import i18n from "../localization/vue-i18n";
+// import i18n from "@/localization";
 
 // State
 const state = reactive({
@@ -159,8 +159,8 @@ const errorMessages = {
   }
 };
 
-i18n.global.mergeLocaleMessage('ru', errorMessages.ru);
-i18n.global.mergeLocaleMessage('en', errorMessages.en);
+// i18n.global.mergeLocaleMessage('ru', errorMessages.ru);
+// i18n.global.mergeLocaleMessage('en', errorMessages.en);
 
 // Mutations
 function setError(error) {

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,10 +38,10 @@ 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/middlewares/client/inputs.validation'
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
 
 // Localization
 const { t } = useI18n({

package/src/modules/legal/components/pages/Legal.vue

@@ -45,7 +45,7 @@
 	// Import libs
 	import { computed, watch, onMounted, ref, onBeforeMount } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
-	import * as auth from '@pf/src/modules/auth/store/auth'	
+	import * as auth from '@pf/src/modules/auth/views/store/auth'	
 	// Accessing router
 	const route = useRoute()
 	const router = useRouter()

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,8 +127,8 @@ 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 auth from '@pf/src/modules/auth/store/auth';
+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';
 import * as orders from '@pf/src/modules/orders/store/orders';

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

@@ -208,15 +208,15 @@
   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 auth from '@pf/src/modules/auth/store/auth';
+  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

@@ -179,12 +179,12 @@
   import Block from '@pf/src/components/Block/Block.vue';
 
   import * as orders from '@pf/src/modules/orders/store/orders';
-  import * as auth from '@pf/src/modules/auth/store/auth';
+  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,16 +85,16 @@ 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'
 
 import FormCustomerDetails from '@pf/src/modules/orders/components/sections/FormCustomerDetails.vue'
 
 import * as users from '@pf/src/modules/users/store/users';
-import * as auth from '@pf/src/modules/auth/store/auth';
+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) => {
     
@@ -45,7 +45,6 @@ module.exports = (db) => {
         trim: true
       }
     }],
-    
     comment: { 
       type: String, 
       trim: true 

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

@@ -4,10 +4,11 @@ const ModelTestimonial = require('./models/testimonial.model.js');
 const ModelApplication = require('./models/application.model.js');
 
 const RoutesOrder = require('./routes/orders.routes.js');
+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
@@ -19,9 +20,10 @@ function initializeOrders(app, db, origins, publicPath) {
   // Setup routes if the app object is provided
   if (app) {
     RoutesOrder(app,db,origins,publicPath)
+    RoutesApplications(app,db,origins,publicPath)
+    new CRUD('/api/customers', app, db, db.customer)
   }
 
-  new CRUD('/api/customers', app, db, db.customer)
 }
 // Exporting controllers, routes, and models
 module.exports = {

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/routes/applications.routes.js

@@ -1,7 +1,8 @@
 // Factories
 const controllerFactory = require("../controllers/applications.controller");
 // Middlewares
-const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/controllers/middlewares');
+
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 

package/src/modules/orders/routes/orders.routes.js

@@ -1,7 +1,7 @@
 // Factories
 const controllerFactory = require("../controllers/orders.controller");
 // Middlewares
-const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/controllers/middlewares');
 // Routes
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);

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/elements/ButtonToggleMembership.vue

@@ -12,7 +12,7 @@
   import Button from "@pf/src/components/Button/Button.vue";
   
   import { ref } from 'vue'
-  import * as auth from '@pf/src/modules/auth/store/auth'
+  import * as auth from '@pf/src/modules/auth/views/store/auth'
   import * as memberships from '@pf/src/modules/organizations/store/memberships'
 
   const emits = defineEmits(['updateMembership'])

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';
@@ -182,8 +182,8 @@ 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/store/auth'
-import * as globals      from '@pf/src/modules/globals/store/globals'
+import * as auth      from '@pf/src/modules/auth/views/store/auth'
+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/pages/Organization.vue

@@ -190,7 +190,7 @@
 	// Local
 	import Products from '@pf/src/modules/products/components/pages/Products.vue';
 	// Import state
-	import * as auth from '@pf/src/modules/auth/store/auth';
+	import * as auth from '@pf/src/modules/auth/views/store/auth';
 	import * as organization from '@pf/src/modules/organizations/store/organizations';
 	import * as memberships from '@pf/src/modules/organizations/store/memberships';
 	import * as departments from '@pf/src/modules/organizations/store/departments';

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

@@ -178,7 +178,7 @@ import IconLeftovers from '@pf/src/modules/icons/entities/IconLeftovers.vue'
 /////////////////////////////
 import { useRoute, useRouter } from 'vue-router'
 
-import * as auth  from '@pf/src/modules/auth/store/auth'
+import * as auth  from '@pf/src/modules/auth/views/store/auth'
 
 import * as organizations  from '@pf/src/modules/organizations/store/organizations'
 

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

@@ -42,7 +42,7 @@ import Select from '@pf/src/components/Select/Select.vue';
 import Button from '@pf/src/components/Button/Button.vue';
 import Places from '@pf/src/modules/organizations/components/sections/Places.vue';
 
-import * as auth from '@pf/src/modules/auth/store/auth';
+import * as auth from '@pf/src/modules/auth/views/store/auth';
 import * as organization from '@pf/src/modules/organizations/store/organizations';
 
 const router = useRouter();

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

@@ -50,9 +50,9 @@ import Field from '@pf/src/components/Field/Field.vue';
 import Select from '@pf/src/components/Select/Select.vue';
 import Button from '@pf/src/components/Button/Button.vue';
 import Places from '@pf/src/modules/organizations/components/sections/Places.vue';
-import * as auth from '@pf/src/modules/auth/store/auth';
+import * as auth from '@pf/src/modules/auth/views/store/auth';
 import * as organization from '@pf/src/modules/organizations/store/organizations';
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation';
+import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation';
 
 const router = useRouter();
 const route = useRoute();

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

@@ -125,7 +125,7 @@
   import Button from '@pf/src/components/Button/Button.vue';
   import Popup from '@pf/src/components/Popup/Popup.vue';
 
-  import * as auth from '@pf/src/modules/auth/store/auth';
+  import * as auth from '@pf/src/modules/auth/views/store/auth';
   import * as organization from '@pf/src/modules/organizations/store/organizations';
   import * as memberships from '@pf/src/modules/organizations/store/memberships';
 

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

@@ -68,7 +68,7 @@
 	import Tab  		from '@pf/src/components/Tab/Tab.vue'
 	import Feed from '@pf/src/modules/organizations/components/sections/Feed.vue'; 
 
-	import * as auth from '@pf/src/modules/auth/store/auth';
+	import * as auth from '@pf/src/modules/auth/views/store/auth';
 	// Accessing router
 	const route = useRoute()
 	const router = useRouter()