@ozdao/martyrs 0.2.563 → 0.2.565

package/src/builder/templates/page.js

@@ -38,14 +38,14 @@ export default `
           requestIdleCallback(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           });
         } else {
           setTimeout(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           }, 0);
         }

package/src/components/Button/Button.vue

@@ -89,6 +89,7 @@ async function Submit() {
     if (props.callback) setTimeout(() => props.callback(), props.callbackDelay)
 
   } catch (err) {
+    console.error('=== BUTTON ERROR ===', err)
     emits('error', err)
     // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке
     button.value.classList.replace('bg-main', 'bg-fourth-nano')
@@ -113,28 +114,23 @@ async function Submit() {
 		class="button"
     :class="{ 'button--disabled': loading || validation }"
   >
-    <Transition name="content" mode="out-in">
-      <!-- Default slot content -->
-      <span v-if="!loading && !error && !finished || !showLoader" class="button-content">
-        <slot></slot>
-      </span>
-      <!-- Loading state -->
-      <Loader v-else-if="loading && !error && showLoader"   class="icon button-content pos-relative pos-t-0 pos-l-0 loading"/>
-      <!-- Success state -->
-      <span v-else-if="finished && showSucces" class="button-content t-semi t-center w-100 loading t-black">
-        <template v-if="text.success">
-          {{ text.success }}
-        </template>
-        <IconCheckmark v-else class="icon" />
-      </span>
-      <!-- Error state -->
-      <span v-else-if="error" class="button-content t-center w-100 error">
-        <template v-if="text.error">
-          {{ text.error }}
-        </template>
-        <IconCross v-else class="icon" />
-      </span>
-    </Transition>
+    <span class="button-content" :class="{ 'hidden': loading || error || finished }">
+      <slot></slot>
+    </span>
+
+    <span class="button-loader" :class="{ 'active': loading && showLoader }">
+      <Loader class=""/>
+    </span>
+
+    <span class="button-success" :class="{ 'active': finished && showSucces }">
+      <template v-if="text.success">{{ text.success }}</template>
+      <IconCheckmark v-else class="i-regular" />
+    </span>
+
+    <span class="button-error" :class="{ 'active': error }">
+      <template v-if="text.error">{{ text.error }}</template>
+      <IconCross v-else class="i-regular" />
+    </span>
     
     <!-- Counter -->
     <div v-if="counter" class="button-counter font-second flex flex-center">
@@ -157,6 +153,7 @@ a.button {
 }
 
 .button {
+  position: relative;
   display: flex;
   padding: var(--small);
   border-radius: var(--small);
@@ -206,32 +203,48 @@ a.button {
   align-items: center;
   justify-content: center;
   gap: 8px;
+  transition: opacity 0.3s ease;
 }
 
-.icon {
-  width: 1rem;
-  height: 1rem;
-}
 
-/* Vue Transitions */
-.content-enter-active,
-.content-leave-active {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+.button-loader {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
 
-.content-enter-from {
+.button-success {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   opacity: 0;
-  transform: translateY(8px) scale(0.95);
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
 
-.content-leave-to {
+.button-error {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   opacity: 0;
-  transform: translateY(-8px) scale(0.95);
+  transition: opacity 0.3s ease;
+  pointer-events: none;
 }
 
-.content-enter-to,
-.content-leave-from {
+.active {
   opacity: 1;
-  transform: translateY(0) scale(1);
+}
+
+.hidden {
+  opacity: 0;
 }
 </style>

package/src/components/FieldPhone/FieldPhone.vue

@@ -404,7 +404,7 @@
     }
     
     // Разрешаем только + и цифры
-    dialCodeInput.value = dialCodeInput.value.replace(/[^\+\d]/g, '');
+    dialCodeInput.value = dialCodeInput.value.replace(/[^+\d]/g, '');
     
     // Убеждаемся что + только в начале
     const plusCount = (dialCodeInput.value.match(/\+/g) || []).length;

package/src/components/Loader/Loader.vue

@@ -22,7 +22,7 @@ export default {
     },
     centered: {
       type: Boolean,
-      default: true, // По умолчанию лоадер центрирован (для обратной совместимости)
+      default: false
     },
   },
 };

package/src/components/Tree/Tree.vue

@@ -1,6 +1,7 @@
 <template>
   <VueDraggableNext
-    v-bind="dragOptions" 
+    v-bind="dragOptions"
+    :disabled="!dragndrop"
     class="dragArea list-group w-full"
     :list="items"
     :handle="'.my-handle'"
@@ -11,10 +12,11 @@
         :item="item"
       >
       </slot>
-      <Tree 
+      <Tree
         :items="item.children"
         :state="state"
         :parent-id="item._id"
+        :dragndrop="dragndrop"
         @update="emitChange"
         class="pd-l-medium"
         v-slot="{ item }"
@@ -36,7 +38,8 @@ import Tree from './Tree.vue';
 const props = defineProps({
   items: Array,
   state: Array,
-  parentId: { type: String, default: null }
+  parentId: { type: String, default: null },
+  dragndrop: { type: Boolean, default: true }
 });
 
 const emits = defineEmits(['update']);

package/src/modules/TASKS.MD

@@ -0,0 +1,17 @@
+## TODO: Архитектурные задачи
+
+### Рефакторинг featured в категориях
+
+**Проблема**: `featured` находится в enum статусов категории, но это архитектурная ошибка.
+
+**Решение**: Вынести `featured` из статусов в отдельное поле:
+- Удалить `featured` из `enum: ['draft', 'published', 'internal', 'archived', 'removed']`
+- Добавить в модель категории: `featured: { type: Boolean, default: false }`
+- Обновить все контроллеры и компоненты, использующие `status: 'featured'`
+- Добавить фильтрацию по `featured: true/false`
+
+**Затронутые файлы**:
+- `/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/modules/core/models/schemas/common.schema.js`
+- `/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/modules/products/models/category.model.js`
+- `/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/modules/products/controllers/categories.controller.js`
+- Все компоненты фронтенда, использующие статус 'featured'

package/src/modules/auth/auth.client.js

@@ -13,7 +13,8 @@ console.log(`[LOADING 36] Store imports completed in ${storesTime.duration.toFix
 
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
-import { getRoutes } from './auth.router.js';
+import { getAuthRoutes } from './views/router/auth.router.js';
+import { getUsersRoutes } from './views/router/users.router.js';
 
 // Middlewares
 import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
@@ -43,10 +44,11 @@ export { default as SliderFeatures } from './views/components/sections/SliderFea
 function initializeAuth(app, store, router, options = {}) {
   i18nManager.register('auth', locales);
 
-  const routes = getRoutes(options);
-  routes.forEach(({ parentName, config }) => {
-    addRoutes(router, { ...config, parentName });
-  });
+  const authRoute = getAuthRoutes(options);
+  const usersRoute = getUsersRoutes(options);
+
+  addRoutes(router, { ...authRoute.config, parentName: authRoute.parentName });
+  addRoutes(router, { ...usersRoute.config, parentName: usersRoute.parentName });
 
   store.addStore('auth', storeAuth);
   store.addStore('twofa', storeTwofa);
@@ -64,7 +66,8 @@ const ModuleAuth = {
       storeUsers,
     },
     router: {
-      getRoutes,
+      getAuthRoutes,
+      getUsersRoutes,
     },
     middlewares: {
       validationAuth,
@@ -77,7 +80,8 @@ export {
   storeAuth,
   storeTwofa,
   storeUsers,
-  getRoutes,
+  getAuthRoutes,
+  getUsersRoutes,
   validationAuth,
   initializeAuth as initialize,
 };

package/src/modules/auth/views/components/pages/SignIn.vue

@@ -113,12 +113,12 @@ import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 // Import store
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 // Import validation
 import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
 
 // Get store
 const store = useStore()
-const auth = store.auth
 const core = store.core
 
 // Init validation

package/src/modules/auth/views/router/auth.router.js

@@ -0,0 +1,94 @@
+// auth.router.js - Authentication routes
+import { requiresNoAuth, resetUser, checkUser } from '../middlewares/auth.validation.js';
+
+export function getAuthRoutes(options = {}) {
+  const route = options.route || 'Home';
+
+  return {
+    parentName: route,
+    config: {
+      basePath: 'auth',
+      component: () => import(/* webpackChunkName: "auth-layout" */ '../components/layouts/Auth.vue'),
+      meta: {
+        title: {
+          en: 'Аутентификация',
+          ru: 'Authentication',
+        },
+      },
+      routes: [
+        {
+          path: 'signin',
+          name: 'Sign In',
+          beforeEnter: [requiresNoAuth, resetUser],
+          meta: {
+            title: {
+              en: 'Sign In',
+              ru: 'Вход',
+            },
+          },
+          component: () => import(/* webpackChunkName: "signin" */ '../components/pages/SignIn.vue'),
+        },
+        {
+          path: 'reset-password',
+          name: 'Reset Password',
+          beforeEnter: [requiresNoAuth, resetUser],
+          meta: {
+            title: {
+              en: 'Reset Password',
+              ru: 'Сбросить Пароль',
+            },
+          },
+          component: () => import(/* webpackChunkName: "reset-password" */ '../components/pages/ResetPassword.vue'),
+        },
+        {
+          path: 'signup',
+          name: 'Sign Up',
+          beforeEnter: [requiresNoAuth, resetUser],
+          meta: {
+            title: {
+              en: 'Sign Up',
+              ru: 'Регистрация',
+            },
+          },
+          component: () => import(/* webpackChunkName: "signup" */ '../components/pages/SignUp.vue'),
+        },
+        {
+          path: 'enter-code',
+          name: 'Enter Code',
+          beforeEnter: [requiresNoAuth, checkUser],
+          meta: {
+            title: {
+              en: 'Enter Code',
+              ru: 'Введите Код',
+            },
+          },
+          component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterCode.vue'),
+        },
+        {
+          path: 'enter-password',
+          name: 'Enter Password',
+          beforeEnter: [requiresNoAuth, checkUser],
+          meta: {
+            title: {
+              en: 'Enter Password',
+              ru: 'Введите Пароль',
+            },
+          },
+          component: () => import(/* webpackChunkName: "signup" */ '../components/pages/EnterPassword.vue'),
+        },
+        {
+          path: 'invite',
+          name: 'Invite',
+          beforeEnter: [requiresNoAuth, resetUser],
+          meta: {
+            title: {
+              en: 'Invite',
+              ru: 'Приглашение',
+            },
+          },
+          component: () => import(/* webpackChunkName: "signup" */ '../components/pages/Invite.vue'),
+        },
+      ],
+    }
+  };
+}

package/src/modules/auth/views/router/users.router.js

@@ -0,0 +1,153 @@
+// users.router.js - User profile routes
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+import { requiresAuth } from '../middlewares/auth.validation.js';
+import IconPlus from '@martyrs/src/modules/icons/navigation/IconPlus.vue';
+import { navigationItems } from '@martyrs/src/modules/auth/views/configs/navigation.user.config.js';
+import ProfileCard from '@martyrs/src/modules/auth/views/components/blocks/ProfileCard.vue';
+import HelpCard from '@martyrs/src/modules/core/views/components/blocks/HelpCard.vue';
+
+const { isPhone, isTablet } = useGlobalMixins();
+
+export function getUsersRoutes(options = {}) {
+  const route = options.route || 'Home';
+
+  return {
+    parentName: route,
+    config: {
+      basePath: 'users',
+      meta: {
+        title: {
+          en: 'Users',
+          ru: 'Пользователи',
+        },
+      },
+      routes: [
+        {
+          path: ':_id',
+          name: 'User Profile Root',
+          meta: {
+            title: {
+              en: 'Profile',
+              ru: 'Профиль',
+            },
+            sidebar_hover: false,
+            sidebar_navigation_items: navigationItems,
+            sidebar_header_component: ProfileCard,
+            sidebar_footer_component: HelpCard,
+            sidebarOpenOnEnter: true,
+            sidebarCloseOnLeave: true
+          },
+          children: [
+            {
+              path: '',
+              name: 'User Profile',
+              meta: {
+                title: {
+                  en: 'Profile',
+                  ru: 'Профиль',
+                },
+                title_hide: true,
+                hideNavigationBar: route => route.params._id === auth.state.user._id,
+              },
+              component: () => import(/* webpackChunkName: "profile" */ '../components/pages/Profile.vue'),
+              children: [
+                {
+                  path: 'edit',
+                  name: 'User Edit Profile',
+                  beforeEnter: [requiresAuth],
+                  component: () => import(/* webpackChunkName: "profile-edit" */ '../components/pages/ProfileEdit.vue'),
+                  children: [
+                    {
+                      path: 'profile',
+                      name: 'Profile Edit Profile',
+                      component: () => import(/* webpackChunkName: "profile-edit-profile" */ '../components/pages/ProfileEditProfile.vue')
+                    },
+                    {
+                      path: 'account',
+                      name: 'Profile Edit Account',
+                      component: () => import(/* webpackChunkName: "profile-edit-account" */ '../components/pages/ProfileEditAccount.vue')
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              path: 'dashboard',
+              name: 'User Dashboard',
+              beforeEnter: [
+                requiresAuth,
+                (to) => {
+                  if (to.params._id !== auth.state.user._id) {
+                    return { name: 'User Profile', params: { _id: to.params._id } };
+                  }
+                }
+              ],
+              meta: {
+                title: {
+                  en: 'Dashboard',
+                  ru: 'Дашборд',
+                },
+              },
+              component: () => import(/* webpackChunkName: "profile-dashboard" */ '../components/pages/UserDashboard.vue'),
+            },
+            {
+              path: 'blogposts',
+              name: 'User Posts',
+              meta: {
+                title: {
+                  en: 'Posts',
+                  ru: 'Посты',
+                },
+              },
+              component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileBlogposts.vue'),
+            },
+            {
+              path: 'events',
+              name: 'User Events',
+              meta: {
+                title: {
+                  en: 'Events',
+                  ru: 'События',
+                },
+              },
+              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/events/components/pages/EventsBackoffice.vue'),
+            },
+            {
+              path: 'organizations',
+              name: 'User Organizations',
+              meta: {
+                title: {
+                  en: 'Groups',
+                  ru: 'Группы',
+                },
+                actions: [
+                  {
+                    component: IconPlus,
+                    props: {
+                      fill: 'rgb(var(--main))',
+                    },
+                    condition: () => auth.state.user && auth.state.user._id,
+                    action: router => router.push({ name: 'Create Organization' }),
+                  },
+                ],
+              },
+              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/organizations/components/pages/Organizations.vue'),
+            },
+            {
+              path: 'wallet',
+              name: 'User Wallet',
+              meta: {
+                title: {
+                  en: 'Wallet',
+                  ru: 'Кошелек',
+                },
+              },
+              component: () => import(/* webpackChunkName: "profile" */ '@martyrs/src/modules/wallet/views/components/pages/Wallet.vue'),
+            },
+          ],
+        },
+      ],
+    }
+  };
+}

package/src/modules/backoffice/components/partials/Sidebar.vue

@@ -3,10 +3,10 @@
     <div class="br-b  h3 h-4r pd-semi br-solid br-black-transp-10">Backoffice</div>
     <div class="pd-semi">
       <span class="pd-thin uppercase t-medium t-transp">Menu</span>
-      <div 
-        v-for="item in menuItems" 
+      <div
+        v-for="item in menuItems"
         :key="item.name"
-        @click="router.push({ name: item.routeName })" 
+        @click="router.push(item.to || { name: item.routeName })"
         class="flex pd-thin flex-v-center cursor-pointer">
         <component 
           v-if="item.icon" 
@@ -19,10 +19,10 @@
       </div>
       
       <span class="pd-thin d-block mn-t-medium uppercase t-medium t-transp">General</span>
-      <div 
-        v-for="item in generalItems" 
+      <div
+        v-for="item in generalItems"
         :key="item.name"
-        @click="router.push({ name: item.routeName })" 
+        @click="router.push(item.to || { name: item.routeName })"
         class="flex pd-thin flex-v-center cursor-pointer">
         <component 
           v-if="item.icon" 
@@ -79,7 +79,7 @@ const menuItems = [
   {
     name: 'organizations',
     title: 'Organizations',
-    routeName: 'Backoffice Organizations',
+    to: '/backoffice/organizations',
     icon: IconGroups
   },
   {

package/src/modules/community/community.server.js

@@ -7,11 +7,19 @@ import ReactionModel from './models/reaction.model.js';
 import blogRoutes from './routes/blog.routes.js';
 import commentsRoutes from './routes/comments.routes.js';
 import reactionsRoutes from './routes/reactions.routes.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
+import initBlogPolicies from './policies/blog.policies.js';
 function initializeCommunity(app, db, origins, publicPath) {
   // Настраиваем модели в объекте базы данных
   db.blogpost = BlogpostModel(db);
   db.comment = CommentModel(db);
   db.reaction = ReactionModel(db);
+
+  // Инициализируем политики ABAC
+  const { getInstance } = coreabac;
+  const abac = getInstance(db);
+  initBlogPolicies(abac, db);
+
   // Настраиваем маршруты, если объект приложения передан
   if (app) {
     blogRoutes(app, db, origins, publicPath);

package/src/modules/community/policies/blog.policies.js

@@ -0,0 +1,55 @@
+export default function initBlogPolicies(abac, db) {
+  abac.registerResourcePolicy(
+    'blogposts',
+    async context => {
+      const allowed = ['published', 'active', 'featured'];
+
+      // 1. Анонимный read — обрезаем статусы прямо в политике
+      if (
+        context.action === 'read' &&
+        !context.user &&
+        (context.options?.allowPublished || context.req?.method === 'GET')
+      ) {
+        const current = context.data?.query?.status;
+        const list = Array.isArray(current) ? current : (current ? [current] : []);
+        const filtered = list.filter(s => allowed.includes(s));
+        context.req.query.status = filtered.length ? filtered : allowed;
+        context.data.query.status = context.req.query.status;
+      }
+
+      // 2. Проверка доступа к draft/archived постам
+      if (context.action === 'read' && context.currentResource) {
+        const status = context.currentResource.status;
+        if (!allowed.includes(status)) {
+          // Если статус draft/archived, проверяем права доступа
+          if (!context.user) {
+            return { allow: false, reason: 'DRAFT_POST_REQUIRES_AUTH' };
+          }
+
+          const ownerId = context.currentResource.owner?.target || context.currentResource.creator?.target;
+
+          // Проверяем владельца
+          if (String(ownerId) === String(context.user)) {
+            return { allow: true };
+          }
+
+          // Проверяем права организации
+          if (context.currentResource.owner?.type === 'organization' && context.checkOrganizationRight) {
+            const hasOrgAccess = await context.checkOrganizationRight('blogposts', 'read');
+            if (hasOrgAccess) {
+              return { allow: true, reason: 'ORGANIZATION_MEMBER_ACCESS' };
+            }
+          }
+
+          return { allow: false, reason: 'DRAFT_POST_ACCESS_DENIED' };
+        }
+      }
+
+      // 3. Остальные проверки можешь расширять позже
+      return { allow: true };
+    },
+    { modelName: 'blogpost' } // важно для loadResource
+  );
+
+  return abac;
+}

package/src/modules/community/routes/blog.routes.js

@@ -1,5 +1,5 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../controllers/blog.controller.js';
 import middlewareFactoryCommunity from '../middlewares/server/index.js';
 // ABAC

package/src/modules/community/routes/comments.routes.js

@@ -1,5 +1,5 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../controllers/comments.controller.js';
 // ABAC
 const { getInstance } = coreabac;

package/src/modules/community/routes/reactions.routes.js

@@ -1,11 +1,8 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import controllerFactory from '../controllers/reactions.controller.js';
-// ABAC
-const { getInstance } = coreabac;
+
 export default (function (app, db) {
   const controller = controllerFactory(db);
-  const abac = getInstance(db);
   const { authJwt } = middlewareFactoryAuth(db);
   app.get('/api/reactions/read', [authJwt.verifyToken(true)], controller.read);
   app.post('/api/reactions/create', [authJwt.verifyToken()], controller.create);