@ozdao/martyrs 0.2.581 → 0.2.583

package/dist/martyrs/src/modules/products/components/pages/Products.vue.js

@@ -9,7 +9,7 @@ import "vue-i18n";
 import { actions as actions$1 } from "../../store/categories.js";
 /* empty css                              */
 import Field from "../../../../components/Field/Field.vue.js";
-import Filters from "../../../core/views/components/sections/Filters.vue.js";
+import Filters from "../../../core/views/components/sections/Filters.vue2.js";
 import Calendar from "../../../../components/Calendar/Calendar.vue2.js";
 import _sfc_main$7 from "../../../../components/Popup/Popup.vue.js";
 import _sfc_main$6 from "../blocks/CardProduct.vue.js";

package/dist/style.css

@@ -1439,21 +1439,21 @@ to {
   margin-left: 0.5rem;
 }
 
-.notification-badge-container[data-v-ce5c73ba] {
+.notification-badge-container[data-v-bea4263c] {
   position: relative;
   display: inline-block;
 }
-.notification-button[data-v-ce5c73ba] {
+.notification-button[data-v-bea4263c] {
   background: none;
   border: none;
   cursor: pointer;
   position: relative;
   font-size: 1.2rem;
 }
-.notification-icon[data-v-ce5c73ba] {
+.notification-icon[data-v-bea4263c] {
   font-size: 1.4rem;
 }
-.button-counter[data-v-ce5c73ba] {
+.button-counter[data-v-bea4263c] {
   position: absolute;
   right: -8px;
   bottom: -8px;
@@ -1467,8 +1467,8 @@ to {
   line-height: 16px;
   font-size: 10px;
 }
-.notifications-loading[data-v-ce5c73ba],
-.notifications-empty[data-v-ce5c73ba] {
+.notifications-loading[data-v-bea4263c],
+.notifications-empty[data-v-bea4263c] {
   padding: 24px;
   text-align: center;
   color: rgb(var(--texfw-light));
@@ -1678,194 +1678,7 @@ to {
 }
 }.cols-3-footer {
   grid-template-columns: 5fr 7fr 4fr;
-}
-.description[data-v-420a3f66] {
-  color: #666;
-  margin-bottom: 24px;
-}
-.preferences-loading[data-v-420a3f66] {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 48px 0;
-}
-.loading-spinner[data-v-420a3f66] {
-  font-size: 2rem;
-  margin-bottom: 16px;
-  animation: spin-420a3f66 2s linear infinite;
-}
-@keyframes spin-420a3f66 {
-0% { transform: rotate(0deg);
-}
-100% { transform: rotate(360deg);
-}
-}
-.preference-item[data-v-420a3f66] {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 16px;
-  border-bottom: 1px solid #eee;
-}
-.preference-item[data-v-420a3f66]:last-child {
-  border-bottom: none;
-}
-.preference-info[data-v-420a3f66] {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-.preference-icon[data-v-420a3f66] {
-  font-size: 1.5rem;
-  margin-right: 16px;
-  width: 40px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.preference-details h3[data-v-420a3f66] {
-  margin: 0 0 4px 0;
-  font-size: 1rem;
-}
-.preference-details p[data-v-420a3f66] {
-  margin: 0;
-  color: #666;
-  font-size: 0.875rem;
-}
-
-/* Toggle switch styles */
-.toggle-switch[data-v-420a3f66] {
-  position: relative;
-  display: inline-block;
-  width: 50px;
-  height: 24px;
-}
-.toggle-switch input[data-v-420a3f66] {
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-.toggle-slider[data-v-420a3f66] {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  transition: .4s;
-  border-radius: 24px;
-}
-.toggle-slider[data-v-420a3f66]:before {
-  position: absolute;
-  content: "";
-  height: 16px;
-  width: 16px;
-  left: 4px;
-  bottom: 4px;
-  background-color: white;
-  transition: .4s;
-  border-radius: 50%;
-}
-input:checked + .toggle-slider[data-v-420a3f66] {
-  background-color: #2196F3;
-}
-input:checked + .toggle-slider[data-v-420a3f66]:before {
-  transform: translateX(26px);
-}
-.form-actions[data-v-420a3f66] {
-  margin-top: 24px;
-  display: flex;
-  justify-content: flex-end;
-  gap: 16px;
-}
-.save-btn[data-v-420a3f66], .cancel-btn[data-v-420a3f66] {
-  padding: 8px 16px;
-  border-radius: 4px;
-  cursor: pointer;
-}
-.save-btn[data-v-420a3f66] {
-  background-color: #2196F3;
-  border: none;
-  color: white;
-}
-.save-btn[data-v-420a3f66]:disabled {
-  background-color: #ccc;
-  cursor: not-allowed;
-}
-.cancel-btn[data-v-420a3f66] {
-  background-color: white;
-  border: 1px solid #ccc;
-}
-
-.notifications-list-container[data-v-5af8a2ed] {
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-}
-.notifications-header[data-v-5af8a2ed] {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-}
-.notifications-controls[data-v-5af8a2ed] {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-}
-.notifications-filter select[data-v-5af8a2ed] {
-  padding: 6px 12px;
-  border-radius: 4px;
-  border: 1px solid #ddd;
-}
-.mark-all-read-btn[data-v-5af8a2ed] {
-  background-color: #2196f3;
-  color: white;
-  border: none;
-  padding: 6px 12px;
-  border-radius: 4px;
-  cursor: pointer;
-}
-.notifications-loading[data-v-5af8a2ed],
-.notifications-empty[data-v-5af8a2ed] {
-  padding: 40px 0;
-  text-align: center;
-  color: #666;
-}
-.loading-spinner[data-v-5af8a2ed] {
-  font-size: 2rem;
-  margin-bottom: 10px;
-  animation: spin-5af8a2ed 1s linear infinite;
-}
-@keyframes spin-5af8a2ed {
-from { transform: rotate(0deg);
-}
-to { transform: rotate(360deg);
-}
-}
-.notifications-items[data-v-5af8a2ed] {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-.notifications-footer[data-v-5af8a2ed] {
-  margin-top: 20px;
-  text-align: center;
-}
-.refresh-btn[data-v-5af8a2ed] {
-  background: none;
-  border: none;
-  color: #666;
-  cursor: pointer;
-  padding: 6px 12px;
-}
-.refresh-btn[data-v-5af8a2ed]:hover {
-  color: #2196f3;
-}
-.embla {
+}.embla {
   overflow: hidden;
 }
 .embla__container {
@@ -1930,6 +1743,66 @@ to { transform: rotate(360deg);
   white-space: pre-line;
   word-wrap: break-word;
 }
+.icon-search-popup[data-v-3479d8be] {
+  min-height: 500px;
+}
+.icon-grid[data-v-3479d8be] {
+  min-height: 400px;
+}
+.icon-item[data-v-3479d8be] {
+  transition: all 0.2s ease;
+}
+.icon-item[data-v-3479d8be]:hover {
+  background-color: rgb(var(--light-hover));
+  transform: scale(1.05);
+}
+.icon-preview[data-v-3479d8be] {
+  background: rgb(var(--light));
+  border-radius: 8px;
+}
+.icon-svg[data-v-3479d8be] {
+  filter: none;
+}
+.w-max-800[data-v-3479d8be] {
+  max-width: 800px;
+  width: 90vw;
+}
+[data-v-3479d8be] .feed-enter-active,[data-v-3479d8be] .feed-leave-active {
+  transition: all 0.3s ease;
+}
+[data-v-3479d8be] .feed-enter-from,[data-v-3479d8be] .feed-leave-to {
+  opacity: 0;
+  transform: scale(0.9);
+}
+
+.h-60[data-v-ac4d495b] {
+  height: 60%;
+}
+.notification[data-v-ac4d495b] {
+  z-index: 100;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  transition: all 0.3s ease;
+  animation: fadeIn-ac4d495b 0.3s;
+}
+@keyframes fadeIn-ac4d495b {
+from { opacity: 0; transform: translateY(20px);
+}
+to { opacity: 1; transform: translateY(0);
+}
+}
+.icon-card .replace-btn[data-v-ac4d495b] {
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+.icon-card:hover .replace-btn[data-v-ac4d495b] {
+  opacity: 1;
+}
+.flex-justify-between[data-v-ac4d495b] {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 fieldset[disabled] .multiselect {
   pointer-events: none;
 }
@@ -2345,66 +2218,6 @@ to {
 }.bg-white-overlay[data-v-0f5877fc] {
   background: linear-gradient(0deg, rgba(var(--white), 1) 0%, rgba(var(--white), 0) 100%);
 }
-.icon-search-popup[data-v-3479d8be] {
-  min-height: 500px;
-}
-.icon-grid[data-v-3479d8be] {
-  min-height: 400px;
-}
-.icon-item[data-v-3479d8be] {
-  transition: all 0.2s ease;
-}
-.icon-item[data-v-3479d8be]:hover {
-  background-color: rgb(var(--light-hover));
-  transform: scale(1.05);
-}
-.icon-preview[data-v-3479d8be] {
-  background: rgb(var(--light));
-  border-radius: 8px;
-}
-.icon-svg[data-v-3479d8be] {
-  filter: none;
-}
-.w-max-800[data-v-3479d8be] {
-  max-width: 800px;
-  width: 90vw;
-}
-[data-v-3479d8be] .feed-enter-active,[data-v-3479d8be] .feed-leave-active {
-  transition: all 0.3s ease;
-}
-[data-v-3479d8be] .feed-enter-from,[data-v-3479d8be] .feed-leave-to {
-  opacity: 0;
-  transform: scale(0.9);
-}
-
-.h-60[data-v-ac4d495b] {
-  height: 60%;
-}
-.notification[data-v-ac4d495b] {
-  z-index: 100;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-  transition: all 0.3s ease;
-  animation: fadeIn-ac4d495b 0.3s;
-}
-@keyframes fadeIn-ac4d495b {
-from { opacity: 0; transform: translateY(20px);
-}
-to { opacity: 1; transform: translateY(0);
-}
-}
-.icon-card .replace-btn[data-v-ac4d495b] {
-  opacity: 0;
-  transition: opacity 0.2s ease;
-}
-.icon-card:hover .replace-btn[data-v-ac4d495b] {
-  opacity: 1;
-}
-.flex-justify-between[data-v-ac4d495b] {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
   /* Existing styles can stay unchanged */
 
 #eventPage {
@@ -2878,14 +2691,7 @@ to { opacity: 1; transform: translateY(0);
 }
 .vue-select-header {
   height: 3rem;
-}.shop-cart-item[data-v-1e6239c6]:first-of-type {
-  padding-top: 0;
 }
-/* Добавляем стиль для текста "просрочено" */
-.t-red[data-v-06132302] {
-  color: red;
-}
-
 .bg-light[data-v-1239e806] {
     background-color: var(--color-bg-light, #f8f9fa);
 }
@@ -2899,7 +2705,9 @@ to { opacity: 1; transform: translateY(0);
 .bg-danger[data-v-7562ca0a] {
   background-color: #ef4444;
 }
-#map[data-v-e9370e2c]:focus {
+.shop-cart-item[data-v-1e6239c6]:first-of-type {
+  padding-top: 0;
+}#map[data-v-e9370e2c]:focus {
   outline: none;
 }
   /* Add styles for the user card component here */
@@ -3596,10 +3404,10 @@ html.barcode-scanner-active-html {
   aspect-ratio: 1/1;
   height: 100%;
   background: #ccc;
-}.blink[data-v-134b043e] {
-  animation: blink-animation-134b043e 1s ease infinite;
+}.blink[data-v-f82cb957] {
+  animation: blink-animation-f82cb957 1s ease infinite;
 }
-@keyframes blink-animation-134b043e {
+@keyframes blink-animation-f82cb957 {
 0%, 100% {
     opacity: 1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.581",
+  "version": "0.2.583",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/TASKS.MD

@@ -14,4 +14,29 @@
 - `/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'
+- Все компоненты фронтенда, использующие статус 'featured'
+
+---
+
+### Перенос конфигурации модулей в базу данных
+
+**Проблема**: Конфигурация модулей (статусы заказов, ставки VAT, fees и т.д.) хранится в `global.config.js`. Это означает:
+- Изменения требуют редеплоя
+- Нет возможности управлять настройками через UI
+- Разные инстансы не могут иметь разные настройки
+
+**Решение**: Перенести конфигурацию в базу данных и управлять через бекофис.
+
+**Что нужно сделать**:
+1. Создать модель `ModuleSettings` для хранения настроек модулей в БД
+2. Создать страницу в бекофисе `/backoffice/settings` для управления параметрами
+3. Перенести настройки из `global.config.js`:
+   - `orders.statuses` - статусы заказов
+   - `orders.showFees`, `orders.feesRate` - настройки комиссий
+   - `orders.showVat`, `orders.vatRate` - настройки НДС
+   - `orders.showDeliveryFee`, `orders.deliveryRate` - настройки доставки
+   - Другие параметры модулей
+4. Загружать настройки при старте приложения и кэшировать
+5. Обновить компоненты для получения настроек из store вместо config
+
+**Приоритет**: Высокий - статусы заказов особенно критичны для разных проектов

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

@@ -161,13 +161,7 @@
 	      <template v-for="(module, moduleName) in modules" :key="moduleName">
 	        <MenuItem 
 	          v-if="isModuleInstalled(moduleName) && (!module.visible || module.visible(auth))"
-	          @click="router.push({
-	            name: `${module.route}`, 
-	            params: {
-	              _id: route.params._id,
-	              user: route.params._id
-	            }
-	          })" 
+	          @click="router.push(module.path(route.params._id))" 
 	          class="profile-menu-item cursor-pointer"
 	        >
 	          <component 
@@ -285,30 +279,30 @@ const { isModuleInstalled } = useGlobalMixins()
 const modules = {
   events: {
     displayName: 'Events',
-    route: 'User Events',
+    path: (_id) => `/users/${_id}/events`,
     icon: IconEvents,
     visible: () => true
   },
   organizations: {
     displayName: 'Groups',
-    route: 'User Organizations',
+    path: (_id) => `/users/${_id}/organizations`,
     icon: IconGroups,
     visible: () => true
   },
-  blogposts: {
+  community: {
     displayName: 'Posts',
-    route: 'User Posts',
+    path: (_id) => `/users/${_id}/blogposts`,
     icon: IconCommunity,
     visible: () => true
   },
   orders: {
     displayName: 'Orders',
-    route: 'UserOrdersList',
+    path: (_id) => `/users/${_id}/orders`,
     icon: IconOrders,
     visible: (auth) => auth.state.user && (
-      auth.state.user._id === route.params._id || 
-      (auth.state.access && auth.state.access.roles && 
-        (auth.state.access.roles.includes('ROLE_MODERATOR') || 
+      auth.state.user._id === route.params._id ||
+      (auth.state.access && auth.state.access.roles &&
+        (auth.state.access.roles.includes('ROLE_MODERATOR') ||
          auth.state.access.roles.includes('ROLE_ADMIN'))
       )
     )

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

@@ -7,7 +7,7 @@
     class="w-m-50r h-40r mobile:h-100 h-m-40r bg-white mobile:radius-zero radius-medium pd-medium"
   >
     <div v-if="loading" class="flex-center h-100">
-      <Loader />
+      <Loader :centered="true"/>
     </div>
     
     <div v-else class="flex h-min-100 flex-row mobile:flex-column gap-regular">