@ozdao/martyrs 0.2.583 → 0.2.585

package/src/modules/core/views/components/layouts/Client.vue

@@ -13,7 +13,7 @@
   	}"
 	>
 		<transition name="moveFromTop" appear>
-			<Loader v-if="!page || store.core.state.loading" :centered="true" class="pos-fixed"/>
+			<Loader v-if="!page || store.core.state.loading" :centered="true" class="pos-fixed z-index-10"/>
 		</transition>
 
 	  <transition 
@@ -129,21 +129,22 @@
 	    </component>
 		  <!-- rows-[minmax(0,1fr)] z-index-1 pos-relative w-100 h-100 -->
 		  <div class="rows-[minmax(0,1fr)] z-index-1 pos-relative w-100 h-100">
-		  	<div id="scrollview" ref="scrollview" @scroll="handleScroll" class="o-y-scroll o-x-hidden h-100">
+
+			<div id="scrollview" ref="scrollview" @scroll="handleScroll" class="o-y-scroll o-x-hidden h-100">
 	  			<Status
 	  				v-if="store.core.state.error.show"
-						:data="store.core.state.error"
-						@close="store.core.state.error.show = false"
-						class="z-index-7"
-					/>
-					<Snack
-	  				v-if="store.core.state.snack.show"
-						:type="store.core.state.snack.type"
-						:message="store.core.state.snack.message"
-						:show="store.core.state.snack.show"
-						@close="store.core.state.snack.show = false"
-						class="z-index-7"
-					/>
+					:data="store.core.state.error"
+					@close="store.core.state.error.show = false"
+					class="z-index-7"
+				/>
+				<Snack
+					v-if="store.core.state.snack.show"
+					:type="store.core.state.snack.type"
+					:message="store.core.state.snack.message"
+					:show="store.core.state.snack.show"
+					@close="store.core.state.snack.show = false"
+					class="z-index-7"
+				/>
 					<div class="h-min-100 pos-relative w-100">
 						<!-- <section v-if="!route.meta?.breadcrumbs?.hide" class="pd-thin pd-b-zero">
 							<Breadcrumbs 
@@ -152,41 +153,38 @@
 							/>
 						</section> -->
 
-				 		<Suspense @resolve="onSuspenseResolved">
-							<router-view  
+						<Suspense @resolve="onSuspenseResolved">
+							<router-view
 								id="view"
-								v-slot="{ Component, route }" 
+								v-slot="{ Component, route }"
 								:class="{
 									'scroll-hide': MOBILE_APP,
 								}"
 								class="h-min-100 pos-relative w-100"
 							>
 								<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
-					      	<component 
-					      		ref="page"  
-					      		:is="Component" 
-					      		class="w-100 h-min-100"
-				      		 	@page-loading="handlePageLoading"
-			              @page-loaded="handlePageLoaded"
-			              :key="componentKey"
-					      	/>
-					      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
-					      	<!-- :key="route.path"  -->
-					      </transition>
-						  </router-view>
+
+									<div :key="componentKey" class="w-100 h-min-100">
+										<component
+											ref="page"
+											:is="Component"
+											class="w-100 h-min-100"
+											@page-loading="handlePageLoading"
+											@page-loaded="handlePageLoaded"
+										/>
+										<component
+											v-if="!MOBILE_APP && route.meta.footer && !route.meta.hideFooter"
+											ref="footer"
+											:is="route.meta.footer"
+											:theme="route.meta.footer_theme || 'light'"
+											:logotype="route.meta.logotype"
+											:location="route.meta.location"
+										/>
+									</div>
+								</transition>
+							</router-view>
 						</Suspense>
 				  </div>
-			    
-			  	<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
-		        <component
-							v-if="!MOBILE_APP && route.meta.footer && !route.meta.hideFooter && page && !store.core.state.loading"
-				      ref="footer"
-				      :is="route.meta.footer"
-				      :theme="route.meta.footer_theme || 'light'"
-				      :logotype="route.meta.logotype"
-				      :location="route.meta.location"
-				    />
-			   	</transition>
 
 					<component
 			      v-if="route.meta.player"
@@ -221,7 +219,7 @@
 
 
 <script setup>
-	import { computed, ref, onMounted  } from 'vue';
+	import { computed, ref, onMounted } from 'vue';
 	// Router
 	import { useRoute } from 'vue-router';
 	// Store
@@ -233,7 +231,7 @@
 	import Popup from '@martyrs/src/components/Popup/Popup.vue';
 	import Breadcrumbs from '@martyrs/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import Loader from '@martyrs/src/components/Loader/Loader.vue';
-
+	
 	import NavigationBar from '@martyrs/src/modules/core/views/components/partials/NavigationBar.vue';
 	import LocationSelection from '@martyrs/src/modules/core/views/components/partials/LocationSelection.vue';
 
@@ -256,6 +254,7 @@
 
 	const store = useStore()
 
+
 	/////////////////////////////
   // LOADING
   /////////////////////////////

package/src/modules/core/views/components/pages/404.vue

@@ -1,5 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router'
+import IconHome from '@martyrs/src/modules/icons/entities/IconHome.vue'
+import IconArrow from '@martyrs/src/modules/icons/navigation/IconArrow.vue'
+import IconSearch from '@martyrs/src/modules/icons/navigation/IconSearch.vue'
+import IconInfo from '@martyrs/src/modules/icons/entities/IconInfo.vue'
+
+const router = useRouter()
+const goBack = () => window.history.length > 1 ? router.back() : router.push('/')
+</script>
+
 <template>
-  <div class="">
-    404 Not Found
+  <div class="pd-thin flex flex-v-center w-100 h-100 ">
+    <div class="bg-light w-100 h-100 flex flex-h-center flex-column radius-big pd-medium">
+
+      <div class="flex flex-v-center gap-thin pd-thin radius-big bg-main w-fit mn-b-medium">
+        <span class="i-medium radius-big bg-grey"></span>
+        <span class="p-small">Error 404</span>
+      </div>
+
+      <h1 class="mn-b-semi">Page not found</h1>
+
+      <p class="p-medium t-transp w-max-35r mn-b-big" style="line-height: 1.6;">
+        The page you are looking for doesn't exist or has been moved. Please check the URL or navigate back to the home page.
+      </p>
+
+      <div class="flex gap-small mn-b-extra">
+        <router-link to="/" class="button bg-black t-white pd-regular radius-small flex flex-v-center gap-thin">
+          <IconHome class="i-regular" :fill="'rgb(var(--white))'" />
+          <span>Go home</span>
+        </router-link>
+        <button @click="goBack" class="button bg-white t-black pd-regular radius-small flex flex-v-center gap-thin">
+          <IconArrow class="i-regular rotate-180" />
+          <span>Go back</span>
+        </button>
+      </div>
+
+      <div class="pd-t-medium  w-max-25r">
+        <span class="p-micro t-transp t-upper t-500 ls-wide d-block mn-b-small">Search Documentation</span>
+        <div class="field-wrapper bg-white flex flex-v-center radius-small pd-small gap-small">
+          <IconSearch class="i-small t-transp" />
+          <input type="text" placeholder="e.g. Installation guide..." class="w-100  bd-none" />
+        </div>
+        <div class="flex gap-medium mn-t-small">
+          <a href="#" class="flex flex-v-center gap-micro p-small t-transp"><IconInfo class="i-small" /> Help Center</a>
+          <a href="#" class="p-small t-transp">API Status</a>
+        </div>
+      </div>
+
+    </div>
   </div>
-</template>
+</template>
+
+<style scoped>
+input { border: none; outline: none; }
+input::placeholder { color: rgba(var(--dark), 0.4); }
+</style>

package/src/modules/core/views/components/partials/Header.vue

@@ -122,7 +122,7 @@
     		
     		br-2px 
     		ease-linear
-    		t-nowrap
+    		ws-nowrap
     	
     	"
     	:class="{

package/src/modules/core/views/components/partials/Sidebar.vue

@@ -139,7 +139,7 @@ router.beforeEach((to, from) => {
         ]"
       >
         <span
-          class="w-100 t-nowrap ease-quint-out  t-left fw-medium mn-r-thin"
+          class="w-100 ws-nowrap ease-quint-out  t-left fw-medium mn-r-thin"
           :class="{ 'hidden': !stateSidebar, 'visible': stateSidebar }"
         >
           Dark Mode

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex o-x-scroll scroll-hide t-nowrap  gap-thin">
+  <div class="flex o-x-scroll scroll-hide ws-nowrap  gap-thin">
     <!-- All Filters Button -->
     <button
       @click="showAllFilters = true"
@@ -20,7 +20,7 @@
       :class="{ 'selected bg-main': isFilterActive(filter) }"
     >
       <IconCalendar v-if="filter.type === 'date'" class="mn-r-micro i-regular" />
-      <span class="t-nowrap">{{ filter.type === 'date' && getFilterValue(filter) ? formatFilterValue(filter) : filter.title }}</span>
+      <span class="ws-nowrap">{{ filter.type === 'date' && getFilterValue(filter) ? formatFilterValue(filter) : filter.title }}</span>
       <span v-if="getFilterValue(filter) && filter.type !== 'date'" class="mn-l-micro">
         {{ formatFilterValue(filter) }}
       </span>

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

@@ -31,7 +31,7 @@
       :selected="tabs_current"
       @update:selected="updateTabsCurrent"
       :tabs="tabs"
-      class="mn-t-small pd-thin bg-light radius-small w-max t-nowrap o-scroll p-regular"
+      class="mn-t-small pd-thin bg-light radius-small w-max ws-nowrap o-scroll p-regular"
     />
   </div>
 </template>

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

@@ -115,6 +115,7 @@ export function createStore() {
   // State создается для каждого store instance (изоляция SSR)
   const state = reactive({
     loading: false,
+    notFound: false,
 
     isOpenLocationPopup: false,
     isOpenSidebar: false,

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

@@ -269,11 +269,19 @@ export async function render({ url, cookies, headers, ssrContext, createApp }) {
   const measure26Total = performance.getEntriesByName('loading-26-total')[0];
   console.log(`[LOADING 26] Total SSR render completed in ${measure26Total?.duration?.toFixed(2)}ms`);
 
+  // Определяем HTTP статус код:
+  // 1. Если store.core.state.notFound === true - 404
+  // 2. Если роут называется 'notfound' - 404
+  // 3. Иначе - 200
+  const statusCode = store.core.state.notFound
+    ? 404
+    : (router.currentRoute?.value?.name?.toLowerCase() === 'notfound' ? 404 : 200);
+
   return {
     html,
     meta: payload,
     state: initialState,
-    statusCode: router.currentRoute?.value?.name?.toLowerCase() === 'notfound' ? 404 : 200,
+    statusCode,
     usedModules: Array.from(ctx.modules || new Set()), // Return used modules
   };
 }

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

@@ -69,7 +69,7 @@
             v-else
             class="bg-light radius-micro w-2r h-thin"
           ></div>
-          <p class="p-nano fw-medium t-nowrap">{{ slot.time }}</p>
+          <p class="p-nano fw-medium ws-nowrap">{{ slot.time }}</p>
         </div>
       </div>
     </div>
@@ -195,7 +195,7 @@
           <section class="bg-black flex-column flex gap-thin pd-thin radius-small">
             <button
               @click="sendTicketEmail(ticket._id)"
-              class="w-100 t-nowrap bg-black br-1px br-white-transp-20 t-white button-small button"
+              class="w-100 ws-nowrap bg-black br-1px br-white-transp-20 t-white button-small button"
             >
               Send Email
             </button>

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

@@ -128,7 +128,7 @@
         <Button 
           :submit="() => createPhoto('draft')" 
           :callback="closePhotoPopup" 
-          class="t-nowrap bg-second w-100"
+          class="ws-nowrap bg-second w-100"
         >
           To drafts
         </Button>

package/src/modules/inventory/components/pages/Inventory.vue

@@ -51,7 +51,7 @@
                 class="w-3r h-3r radius-small bg-light object-fit-cover"
               />
               <PlaceholderImage v-else class="w-3r h-3r radius-small" />
-              <p class="truncate t-nowrap">{{ row.name || 'Unknown Product' }}</p>
+              <p class="truncate ws-nowrap">{{ row.name || 'Unknown Product' }}</p>
             </div>
           </template>
 
@@ -127,13 +127,13 @@
               align="right"
             >
               <div class="bg-white radius-small">
-                <button @click="openStockAudit(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                <button @click="openStockAudit(row)" class="cursor-pointer t-left ws-nowrap w-100 pd-small">
                   Audit Stock
                 </button>
-                <button @click="openStockHistory(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                <button @click="openStockHistory(row)" class="cursor-pointer t-left ws-nowrap w-100 pd-small">
                   Stock History
                 </button>
-                <button @click="openReorderSettings(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                <button @click="openReorderSettings(row)" class="cursor-pointer t-left ws-nowrap w-100 pd-small">
                   Set Alerts
                 </button>
               </div>

package/src/modules/inventory/components/pages/InventoryEdit.vue

@@ -175,7 +175,7 @@
             align="right"
           >
             <div class="bg-white radius-small">
-              <button @click="leftovers.state.current.positions.splice(index, 1)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+              <button @click="leftovers.state.current.positions.splice(index, 1)" class="cursor-pointer t-left ws-nowrap w-100 pd-small">
                 Delete
               </button>
             </div>

package/src/modules/music/components/pages/Playlist.vue

@@ -374,8 +374,8 @@ const actionButtons = computed(() => {
     {
       type: 'dropdown',
       items: [
-        { text: 'Add to Queue', action: addToQueue, class: 't-nowrap' },
-        { text: 'Copy Link', action: copyLink, class: 't-nowrap' }
+        { text: 'Add to Queue', action: addToQueue, class: 'ws-nowrap' },
+        { text: 'Copy Link', action: copyLink, class: 'ws-nowrap' }
       ]
     }
   ];
@@ -383,19 +383,19 @@ const actionButtons = computed(() => {
   if (isOwner.value || isCollaborator.value) {
     const items = buttons[3].items;
     items.push({ separator: true });
-    items.push({ text: 'Edit Playlist', action: editPlaylist, class: 't-nowrap' });
+    items.push({ text: 'Edit Playlist', action: editPlaylist, class: 'ws-nowrap' });
 
     if (isOwner.value) {
       items.push({
         text: playlist.value?.isCollaborative ? 'Make Private' : 'Make Collaborative',
         action: toggleCollaborative,
-        class: 't-nowrap'
+        class: 'ws-nowrap'
       });
       items.push({
         text: 'Delete Playlist',
         action: deletePlaylist,
         color: 'danger',
-        class: 't-nowrap'
+        class: 'ws-nowrap'
       });
     }
   }

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

@@ -1,9 +1,41 @@
 // Use dynamic imports for better code splitting
+import { requiresAuth } 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 checkOrdersAccess = (to) => {
+  const context = to.matched[0]?.meta?.context;
+
+  // User контекст: владелец, модератор или админ
+  if (context === 'user') {
+    const isOwner = to.params._id === auth.state.user?._id;
+    const roles = auth.state.access?.roles || [];
+    const isAdminOrMod = isAdmin(roles) || roles.includes('ROLE_MODERATOR');
+    if (!isOwner && !isAdminOrMod) {
+      return '/401';
+    }
+  }
+
+  // Backoffice контекст: только админы
+  if (context === 'backoffice') {
+    const roles = auth.state.access?.roles || [];
+    if (!isAdmin(roles)) {
+      return '/401';
+    }
+  }
+
+  // Organization контекст - пока пропускаем (там ABAC на бэкенде)
+  // Root контекст - публичный
+};
 
 const ordersRoutes = [
   {
     path: '',
     name: 'OrdersList',
+    beforeEnter: [requiresAuth, checkOrdersAccess],
     component: () => import(/* webpackChunkName: "orders" */ '@martyrs/src/modules/orders/components/pages/Orders.vue'),
     meta: {
       title: {
@@ -37,6 +69,7 @@ const ordersRoutes = [
   {
     path: ':order',
     name: 'Order',
+    beforeEnter: [requiresAuth, checkOrdersAccess],
     component: () => import(/* webpackChunkName: "orders" */ '@martyrs/src/modules/orders/components/pages/OrderBackoffice.vue'),
     props: route => ({
       mode: route.matched[0].meta.context === 'backoffice' ? 'edit' : 'view',

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

@@ -69,7 +69,7 @@
 
     <div 
       v-if="showProducts && organization.products" 
-      class="mn-b-small t-nowrap mn-t-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium"
+      class="mn-b-small ws-nowrap mn-t-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium"
     >
       <IconTime class="i-medium t-transp mn-r-micro"/>
       <span class="mn-r-micro">

package/src/modules/pages/pages.router.js

@@ -1,5 +1,6 @@
 import layoutEmpty from '@martyrs/src/modules/core/views/components/layouts/Empty.vue';
-import Sidebar from '@martyrs/src/modules/backoffice/components/partials/Sidebar.vue';
+import Navigation from '@martyrs/src/modules/core/views/components/partials/Navigation.vue';
+import { navigationItems } from '@martyrs/src/modules/backoffice/configs/navigation.backoffice.config.js';
 import SidebarPages from './views/components/partials/SidebarPages.vue';
 
 function createPublicRoutes(options = {}) {
@@ -92,7 +93,8 @@ export function getRoutes(options = {}) {
           title: {
             en: 'Pages',
           },
-          sidebar: Sidebar,
+          sidebar_navigation: Navigation,
+          sidebar_navigation_items: navigationItems,
         },
         routes: createBackofficeRoutes(options),
       },

package/src/modules/pages/views/components/pages/PageEdit.vue

@@ -15,14 +15,14 @@
         v-if="route.params.url"
         :submit="() => onDelete()" 
         :callback="() => deletePageCallback()" 
-        class="t-nowrap bg-second w-max"
+        class="ws-nowrap bg-second w-max"
       >
         Delete
       </Button>
 
        <Button 
         :submit="() => onSubmit()" 
-        class="mn-l-auto t-nowrap t-white bg-black w-max"
+        class="mn-l-auto ws-nowrap t-white bg-black w-max"
       >
         Save
       </Button>

package/src/modules/pages/views/components/partials/SidebarPages.vue

@@ -25,7 +25,7 @@
       </div>
       <Button 
         :submit="() => onSubmit()" 
-        class="mn-l-auto t-nowrap t-white bg-black w-max"
+        class="mn-l-auto ws-nowrap t-white bg-black w-max"
       >
         Save
       </Button>

package/src/modules/pages/views/router/pages.backoffice.router.js

@@ -1,5 +1,5 @@
-import Sidebar from '@martyrs/src/modules/backoffice/components/partials/Sidebar.vue';
-
+import Navigation from '@martyrs/src/modules/core/views/components/partials/Navigation.vue';
+import { navigationItems } from '@martyrs/src/modules/backoffice/configs/navigation.backoffice.config.js';
 import SidebarPages from '../components/partials/SidebarPages.vue';
 
 const pages = {
@@ -8,7 +8,8 @@ const pages = {
     title: {
       en: 'Pages',
     },
-    sidebar: Sidebar,
+    sidebar_navigation: Navigation,
+    sidebar_navigation_items: navigationItems,
   },
   children: [
     {

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

@@ -151,7 +151,7 @@
               v-for="category in currentCategories"
               :key="category._id"
               @click="selectCategory(category)"
-              class=" flex-child-default bg-light flex t-nowrap pd-medium radius-medium cursor-pointer hover:bg-light ease"
+              class=" flex-child-default bg-light flex ws-nowrap pd-medium radius-medium cursor-pointer hover:bg-light ease"
             >
               {{ category.name }}
             </div>

package/src/modules/products/components/sections/EditDiscounts.vue

@@ -81,7 +81,7 @@
             { value: 'discount', label: 'Discount (%)' },
             { value: 'special_price', label: 'Special Price' },
           ]"
-          class="pos-relative t-nowrap bg-white gap-small flex flex-column pd-thin radius-thin"
+          class="pos-relative ws-nowrap bg-white gap-small flex flex-column pd-thin radius-thin"
         />
       </Field>
 

package/src/modules/products/components/sections/ProductConfigurator.vue

@@ -61,7 +61,7 @@
       >
         <div v-if="isVariantAvailable" class="gap-micro flex flex-center flex-nowrap">
           <IconShopcartAdd class="i-medium"/>
-          <span class="t-nowrap">{{ t('addtoorder') }}</span>
+          <span class="ws-nowrap">{{ t('addtoorder') }}</span>
         </div>
         <template v-else>
           <span v-if="!selectedVariant && productVariants.length > 1">Select variant</span>

package/src/modules/spots/components/pages/Spots.vue

@@ -24,7 +24,7 @@
               v-for="category in currentCategories"
               :key="category._id"
               @click="selectCategory(category)"
-              class="flex-child-default bg-light flex t-nowrap pd-medium radius-medium cursor-pointer hover:bg-light ease"
+              class="flex-child-default bg-light flex ws-nowrap pd-medium radius-medium cursor-pointer hover:bg-light ease"
             >
               {{ category.name }}
             </div>

package/src/modules/wallet/views/components/blocks/CryptoDeposit.vue

@@ -10,7 +10,7 @@
     <Select 
       :options="depositOptions"
       v-model:select="state.chosenNetwork"
-      class="bg-light t-nowrap pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
+      class="bg-light ws-nowrap pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
     />
   </Field>
 

package/src/modules/wallet/views/components/pages/Wallet.vue

@@ -16,7 +16,7 @@
           <h2>{{state.tokenBalance}} {{ t('wallet.token') }}</h2>
         </div>
 
-        <button @click="openGetMorePopup" class="t-nowrap w-max bg-main fw-medium button">Get More</button>
+        <button @click="openGetMorePopup" class="ws-nowrap w-max bg-main fw-medium button">Get More</button>
 
 
         <Button