@ozdao/martyrs 0.2.601 → 0.2.603

package/src/modules/core/views/components/sections/SectionPageTitle.vue

@@ -1,15 +1,22 @@
 <template>
-  <div>
-    <header class="flex-v-center flex-nowrap flex">
+  <div class="">
+    <header class="flex-v-center flex-nowrap flex ">
       <h1 class="h2 mn-r-auto">{{ title }}</h1>
 
-      <template  
-        v-for="action in actions"   
-        v-if="actions && actions.length > 0"
+      <template
+        v-for="(action, index) in actions"
+        :key="index"
       >
+        <component
+          v-if="action.component && (typeof action.condition === 'function' ? action.condition() : action.condition !== false)"
+          :is="action.component"
+          v-bind="action.props"
+          @click="action.action && action.action($router, $route)"
+          class="i-medium cursor-pointer"
+        />
+
         <router-link
-          v-if="action.to"
-          :key="action.to"
+          v-else-if="action.to"
           :to="action.to"
           :class="action.class || 'radius-extra pd-small pd-r-medium pd-l-medium p-regular uppercase fw-medium hover:scale-[1.05] ease cursor-pointer t-white bg-second flex-center flex'"
         >
@@ -17,7 +24,7 @@
         </router-link>
 
         <button
-          v-if="action.method"
+          v-else-if="action.method"
           @click="action.method"
           :class="action.class || 'radius-extra pd-thin uppercase fw-medium hover:scale-[1.05] ease cursor-pointer t-white bg-second flex-center flex'"
         >
@@ -31,16 +38,20 @@
       :selected="tabs_current"
       @update:selected="updateTabsCurrent"
       :tabs="tabs"
-      class="mn-t-small pd-thin bg-light radius-small w-max ws-nowrap o-scroll p-regular"
+      classTab="bg-white"
+      class="mn-t-small w-100 bg-light pd-thin radius-medium gap-thin"
     />
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router'
 
 import Tab from '@martyrs/src/components/Tab/Tab.vue'
 
+const $router = useRouter()
+const $route = useRoute()
+
 const emits = defineEmits([
   'update:tabs_current'
 ])
@@ -49,13 +60,10 @@ const props = defineProps({
   title: String,
   actions: Array,
   tabs: Array,
-  tabs_current: [Object, String]
+  tabs_current: [Object, String],
 });
 
 const updateTabsCurrent = (newValue) => {
-  emits('update:tabs_current', newValue); // Emitting to parent component
+  emits('update:tabs_current', newValue);
 }
 </script>
-
-<style scoped>
-</style>

package/src/modules/core/views/mixins/mixins.js

@@ -1,4 +1,5 @@
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js';
 
 // useGlobalMixins.js
 export function useGlobalMixins() {
@@ -114,8 +115,8 @@ export function useGlobalMixins() {
       ...options, // дополнительные настройки
     };
 
-    // Язык, по умолчанию "ru" (русский)
-    const locale = options.language || 'ru';
+    // Язык из текущей локали приложения
+    const locale = options.language || i18nManager.i18nInstance?.global?.locale?.value || 'en';
 
     // Используем Intl.DateTimeFormat для локализации
     const dateFormatter = new Intl.DateTimeFormat(locale, formatOptions);
@@ -129,7 +130,7 @@ export function useGlobalMixins() {
       yearOnly: options.yearOnly || false,
       custom: options.custom || '',
       monthName: options.monthName || false, // Новый параметр для вывода названия месяца
-      language: options.language || 'ru', // Язык, по умолчанию русский
+      language: options.language || i18nManager.i18nInstance?.global?.locale?.value || 'en',
     };
 
     if (format.dateOnly) {

package/src/modules/core/views/router/addRoutes.js

@@ -1,4 +1,3 @@
-import layoutEmpty from '@martyrs/src/modules/core/views/components/layouts/Empty.vue';
 import NotFound from '@martyrs/src/modules/core/views/components/pages/404.vue'; // Предполагаемый компонент 404
 
 function addRoutes(router, config) {
@@ -9,7 +8,7 @@ function addRoutes(router, config) {
     routeNamePrefix = '', // Префикс для имен маршрутов
     filterConfig = {}, // Конфигурация фильтрации
     meta = {}, // Мета-данные для маршрутов
-    component = layoutEmpty, // Компонент по умолчанию (layout)
+    component, // Компонент для промежуточного роута (без компонента = componentless route)
     emptyRootBehavior = {
       // Поведение для пустого корневого маршрута
       type: 'redirect', // 'redirect' или 'fallback'

package/src/modules/core/views/utils/vue-app-renderer.js

@@ -42,6 +42,18 @@ export function renderAndMountApp({ createApp, hooks = {} }) {
       performance.measure('loading-23', 'loading-23-start', 'loading-23-end');
       const measure23 = performance.getEntriesByName('loading-23')[0];
       console.log(`[LOADING 23] Server modules loaded in ${measure23?.duration?.toFixed(2)}ms`);
+
+      // Загружаем preloaded модули до mount (provide должен быть до inject в компонентах)
+      for (const [name, loaderConfig] of moduleManager.loaders) {
+        if (loaderConfig.preload && !moduleManager.initialized.has(name)) {
+          try {
+            await moduleManager.load(name, context);
+            await moduleManager.initialize(name, context);
+          } catch (error) {
+            console.error(`Failed to preload module ${name}:`, error);
+          }
+        }
+      }
     }
     
     // Call beforeHydration hook if provided

package/src/modules/events/components/pages/EditEventTickets.vue

@@ -24,7 +24,7 @@
         </div>
         <div class="bg-white radius-medium pd-medium">
           <p class="p-small fw-medium t-transp uppercase mn-b-thin">Free</p>
-          <h2 class="h2 t-grey">{{ stats.free }}</h2>
+          <h2 class="h2 t-dark">{{ stats.free }}</h2>
         </div>
         <div class="bg-white radius-medium pd-medium">
           <p class="p-small fw-medium t-transp uppercase mn-b-thin">Refunds</p>

package/src/modules/events/components/pages/Events.vue

@@ -114,6 +114,7 @@
         }"
         :options="{
             user: auth.state.user._id,
+            status: ['published', 'featured'],
             limit: 9
         }"
         v-slot="{ 

package/src/modules/events/components/pages/EventsBackoffice.vue

@@ -2,46 +2,24 @@
 	<div 
 		class=""
 	>
-		<header 
-			class="mn-b-medium pd-thin flex-v-center flex-nowrap flex"
-		>
-    	<h2
-    		class="mn-r-medium"
-    	>
-    		Events
-    	</h2>
-    	
-    	<button
-    		v-if="auth.state.user._id === route.params.user || route.params._id"
-    		@click="router.push({name: getRouteName('Create Event')})"
-    		class="radius-extra i-big hover:scale-[1.05] cursor-pointer t-white bg-second"
-    	>
-    		+
-    	</button>
-		</header>
+		<SectionPageTitle
+			title="Events"
+			:actions="(auth.state.user._id === route.params._id || route.meta.context === 'organization')
+				? [{ method: () => router.push({ name: routePrefix + 'CreateEvent' }), label: '+', class: 'radius-extra i-big hover:scale-[1.05] cursor-pointer t-white bg-second' }]
+				: []"
+			:tabs="auth.state.user._id === route.params._id
+				? [
+					{ name: 'Organizer', value: 'owner' },
+					{ name: 'Participant', value: 'participant' },
+				]
+				: null"
+			:tabs_current="tabEventOwner"
+			@update:tabs_current="tabEventOwner = $event"
+			class="pd-thin"
+		/>
 
 		<section class="pd-thin rows-1 bg-white">
 
-			<Tab 
-				v-if="auth.state.user._id === route.params.user"
-				v-model:selected="tabEventOwner"
-				:tabs="[
-					{ name: 'Organizer', 	value: 'owner' },
-					{ name: 'Participant', 	value: 'participant' },	
-				]"
-				class="
-					mn-b-thin
-					flex-child-default
-					h-max
-					o-hidden 
-					h5 
-					bg-white
-					gap-micro pd-t-thin pd-b-thin
-					br-b-1px br-black-transp-10
-				"
-				classTab="bg-light pd-small radius-small w-100"
-			/>
-
 			<Feed
 				:search="true"
 				v-model:sort="sort"
@@ -57,7 +35,7 @@
 	      :options="{
 	        user: auth.state.user._id,
 	        owner: route.params._id,
-	        creator: route.params.user,
+	        creator: route.meta.context === 'user' ? route.params._id : null,
 	        sortParam: 'date.start',
 	        sortOrder: 'desc'
 	      }"
@@ -96,7 +74,7 @@
 					  }]" 
 					/> -->
 	       <CardEvent
-	        @click="router.push({name: getRouteName('Event'), params: {url: event.url}})"
+	        @click="router.push({name: routePrefix + 'Event', params: {url: event.url}})"
 	        v-for="(event,index) in items"
 	        :key="event._id"
 	        :event="event"
@@ -104,8 +82,8 @@
 	        :type="'normal'"
 	        :actions="auth.state.user._id === event.creator.target._id || hasAccess(event.owner?.target?._id, 'events', 'edit', auth.state.accesses, auth.state.access.roles)
 	          ? [
-	              { label: 'Edit Event', to: { name: getRouteName('Edit Event'), params: { url: event.url } } },
-	              { label: 'Manage Tickets', to: { name: getRouteName('Edit Event Tickets'), params: { url: event.url } } }
+	              { label: 'Edit Event', to: { name: routePrefix + 'EditEvent', params: { url: event.url } } },
+	              { label: 'Manage Tickets', to: { name: routePrefix + 'EditEventTickets', params: { url: event.url } } }
 	            ]
 	          : []"
 	        class="bg-light radius-medium"
@@ -136,7 +114,7 @@
 	import { watch, ref, computed } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
 	// Components
-	import Tab  		from '@martyrs/src/components/Tab/Tab.vue'
+	import SectionPageTitle from '@martyrs/src/modules/core/views/components/sections/SectionPageTitle.vue'
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
 import Table from '@martyrs/src/components/Table/Table.vue'
@@ -154,15 +132,12 @@ import Table from '@martyrs/src/components/Table/Table.vue'
 
 	const { hasAccess } = useGlobalMixins()
 
-	// Определение контекста и префикса роутов
 	const routePrefix = computed(() => {
-		const context = route.meta?.context
-		if (context === 'backoffice') return 'Backoffice'
-		if (context === 'organization') return 'Organization_'
+		if (route.meta.context === 'user') return 'User'
+		if (route.meta.context === 'organization') return 'Organization'
+		if (route.meta.context === 'backoffice') return 'Backoffice'
 		return ''
 	})
-
-	const getRouteName = (baseName) => `${routePrefix.value}${baseName}`
 	// State
 	let tab = route.query.tab ? route.query.tab : 'owner';
 

package/src/modules/events/components/sections/List.vue

@@ -52,8 +52,8 @@
       default: null
     },
     status: {
-      type: String,
-      default: null
+      type: [String, Array],
+      default: () => ['published', 'featured']
     },
     organization: {
       type: String,

package/src/modules/events/events.client.js

@@ -4,7 +4,10 @@ import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
 import * as storeEvents from './store/events.js';
 
 // Router
-import { getRoutes } from './router/events.router.js';
+import routerRoot from './router/events.router.js';
+import routerUser from './router/events.user.router.js';
+import routerOrganization from './router/events.organization.router.js';
+import routerBackoffice from './router/events.backoffice.router.js';
 
 // Views
 import CardEvent from './components/blocks/CardEvent.vue';
@@ -18,37 +21,63 @@ import EventsHot from './components/sections/EventsHot.vue';
 import Feed from './components/sections/Feed.vue';
 import List from './components/sections/List.vue';
 
-// Пример функции инициализации для модуля событий
 function initializeEvents(app, store, router, options = {}) {
-  const routes = getRoutes(options);
-  routes.forEach(({ parentName, config }) => {
-    addRoutes(router, { ...config, parentName });
+  // Root: /events/*
+  addRoutes(router, {
+    parentName: options.route || 'Home',
+    basePath: options.basePath || 'events',
+    routes: routerRoot,
+    meta: { context: 'root', title: { en: 'Events', ru: 'События' }, title_hide: true },
   });
 
+  // User: /users/:_id/events/*
+  if (!options.withUserRoutes) {
+    addRoutes(router, {
+      parentName: options.routeUser || 'User Profile Root',
+      basePath: 'events',
+      routes: routerUser,
+      routeNamePrefix: 'User',
+      meta: { context: 'user' },
+    });
+  }
+
+  // Organization: /organizations/:_id/events/*
+  if (!options.withOrganizationRoutes) {
+    addRoutes(router, {
+      parentName: options.routeOrganizations || 'OrganizationRoot',
+      basePath: 'events',
+      routes: routerOrganization,
+      routeNamePrefix: 'Organization',
+      meta: { context: 'organization' },
+    });
+  }
+
+  // Backoffice: /backoffice/events/*
+  if (!options.withBackoffice) {
+    addRoutes(router, {
+      parentName: options.routeBackoffice || 'Backoffice Root',
+      basePath: 'events',
+      routes: routerBackoffice,
+      routeNamePrefix: 'Backoffice',
+      meta: { context: 'backoffice' },
+    });
+  }
+
   store.addStore('events', storeEvents);
 }
 
 const ModuleEvents = {
   initialize: initializeEvents,
   views: {
-    store: {
-      storeEvents,
-    },
-    router: {
-      getRoutes,
-    },
+    store: { storeEvents },
     components: {
-      // Blocks
       CardEvent,
       CardEventShort,
-      // Sections
       Feed,
       List,
       FeaturedEvents,
       EventsHot,
-      // Layouts
       EventsLayout,
-      // Pages
       EditEvent,
       Event,
       EventsPage,
@@ -57,10 +86,8 @@ const ModuleEvents = {
 };
 
 export {
-  // Blocks
   CardEvent,
   CardEventShort,
-  getRoutes,
   EditEvent,
   Event,
   EventsLayout,

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

@@ -0,0 +1,80 @@
+import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+
+const { isAdmin } = useGlobalMixins();
+
+const eventsBackofficeRoutes = [
+  {
+    path: '',
+    name: 'Events',
+    meta: {
+      title: { en: 'Events', ru: 'События' },
+    },
+    component: () => import(/* webpackChunkName: 'events-backoffice' */ '../components/pages/EventsBackoffice.vue'),
+  },
+  {
+    path: 'create',
+    name: 'CreateEvent',
+    meta: {
+      title: { en: 'Create Event', ru: 'Создать Событие' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-edit' */ '../components/pages/EditEvent.vue'),
+  },
+  {
+    path: ':url',
+    name: 'Event',
+    meta: {
+      title: { en: 'Event', ru: 'Событие' },
+    },
+    component: () => import(/* webpackChunkName: 'events-detail' */ '../components/pages/Event.vue'),
+  },
+  {
+    path: ':url/edit',
+    name: 'EditEvent',
+    meta: {
+      title: { en: 'Edit Event', ru: 'Редактировать Событие' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-edit' */ '../components/pages/EditEvent.vue'),
+  },
+  {
+    path: ':url/edit/tickets',
+    name: 'EditEventTickets',
+    meta: {
+      title: { en: 'Event Tickets', ru: 'Билеты События' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-tickets' */ '../components/pages/EditEventTickets.vue'),
+  },
+];
+
+export default eventsBackofficeRoutes;

package/src/modules/events/router/events.organization.router.js

@@ -0,0 +1,80 @@
+import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+
+const { hasAccess, isAdmin } = useGlobalMixins();
+
+const eventsOrganizationRoutes = [
+  {
+    path: '',
+    name: 'Events',
+    meta: {
+      title: { en: 'Events', ru: 'События' },
+    },
+    component: () => import(/* webpackChunkName: 'events-backoffice' */ '../components/pages/EventsBackoffice.vue'),
+  },
+  {
+    path: 'create',
+    name: 'CreateEvent',
+    meta: {
+      title: { en: 'Create Event', ru: 'Создать Событие' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles) || hasAccess(to.params._id, 'events', 'create', auth.state.accesses, auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-edit' */ '../components/pages/EditEvent.vue'),
+  },
+  {
+    path: ':url',
+    name: 'Event',
+    meta: {
+      title: { en: 'Event', ru: 'Событие' },
+    },
+    component: () => import(/* webpackChunkName: 'events-detail' */ '../components/pages/Event.vue'),
+  },
+  {
+    path: ':url/edit',
+    name: 'EditEvent',
+    meta: {
+      title: { en: 'Edit Event', ru: 'Редактировать Событие' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles) || hasAccess(to.params._id, 'events', 'edit', auth.state.accesses, auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-edit' */ '../components/pages/EditEvent.vue'),
+  },
+  {
+    path: ':url/edit/tickets',
+    name: 'EditEventTickets',
+    meta: {
+      title: { en: 'Event Tickets', ru: 'Билеты События' },
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      (to, from, next) => {
+        if (isAdmin(auth.state.access.roles) || hasAccess(to.params._id, 'events', 'edit', auth.state.accesses, auth.state.access.roles)) {
+          next();
+        } else {
+          next('/401');
+        }
+      }
+    ],
+    component: () => import(/* webpackChunkName: 'events-tickets' */ '../components/pages/EditEventTickets.vue'),
+  },
+];
+
+export default eventsOrganizationRoutes;