@ozdao/martyrs 0.2.582 → 0.2.583

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));
@@ -1743,6 +1743,66 @@ to {
   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;
 }
@@ -2158,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 {
@@ -2691,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);
 }
@@ -2712,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 */
@@ -3409,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.582",
+  "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/UserDashboard.vue

@@ -1,160 +1,249 @@
 <template>
-	<div class="pd-medium bg-white">
-		<h2 class="mn-b-small">Overview</h2>
-		<div class="mn-b-medium cols-3 mobile:cols-1 gap-thin">
-			<Block class="pos-relative">
-				<span class="t-green fw-semi pos-absolute pos-t-small pos-r-small">+12.5%</span>
-				<div class="mn-b-medium radius-small w-max bg-main"><IconGroups class="i-medium mn-small"/></div>
-				<p class="h3 mn-b-thin">{{ stats.organizations || 0 }}</p>
-				<p>My Groups</p>
-			</Block>
-
-			<Block class="pos-relative">
-				<span class="t-green fw-semi pos-absolute pos-t-small pos-r-small">+14.8%</span>
-				<div class="mn-b-medium radius-small w-max bg-main"><IconOrders class="i-medium mn-small"/></div>
-				<p class="h3 mn-b-thin">{{ stats.orders || 0 }}</p>
-				<p>My Orders</p>
-			</Block>
-
-			<Block class="pos-relative">
-				<span class="t-green fw-semi pos-absolute pos-t-small pos-r-small">+25.1%</span>
-				<div class="mn-b-medium radius-small w-max bg-main"><IconEvents class="i-medium mn-small"/></div>
-				<p class="h3 mn-b-thin">{{ stats.events || 0 }}</p>
-				<p>My Events</p>
-			</Block>
+	<div class="pd-medium">
+		<h2 class="mn-b-medium">Overview</h2>
+
+		<!-- Stats Cards -->
+		<div class="mn-b-medium cols-3 mobile:cols-1 gap-small">
+			<router-link
+				:to="`/users/${auth.state.user._id}/organizations`"
+				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
+			>
+				<div class="flex flex-v-center gap-small mn-b-small">
+					<div class="radius-small bg-main flex flex-center">
+						<IconGroups class="i-medium mn-small" :fill="'rgb(var(--white))'"/>
+					</div>
+					<span class="t-grey t-small">My Groups</span>
+				</div>
+				<p class="h2 fw-semi">{{ stats.organizations || 0 }}</p>
+			</router-link>
+
+			<router-link
+				:to="`/users/${auth.state.user._id}/orders`"
+				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
+			>
+				<div class="flex flex-v-center gap-small mn-b-small">
+					<div class="radius-small bg-main flex flex-center">
+						<IconOrders class="i-medium mn-small" :fill="'rgb(var(--white))'"/>
+					</div>
+					<span class="t-grey t-small">My Orders</span>
+				</div>
+				<p class="h2 fw-semi">{{ stats.orders || 0 }}</p>
+			</router-link>
+
+			<router-link
+				:to="`/users/${auth.state.user._id}/events`"
+				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
+			>
+				<div class="flex flex-v-center gap-small mn-b-small">
+					<div class="radius-small bg-main flex flex-center">
+						<IconEvents class="i-medium mn-small" :fill="'rgb(var(--white))'"/>
+					</div>
+					<span class="t-grey t-small">My Events</span>
+				</div>
+				<p class="h2 fw-semi">{{ stats.events || 0 }}</p>
+			</router-link>
 		</div>
 
-		<div class="cols-2 mobile:cols-1 gap-thin">
-			<Block
-				title="Recent Orders"
-				class="pos-relative"
-			>
+		<!-- Content Grid -->
+		<div class="cols-2 mobile:cols-1 gap-small">
+			<!-- Recent Orders -->
+			<Block title="Recent Orders">
 				<Feed
-	        :showLoadMore="false"
-	        :LoadMore="false"
-	        :states="{
-	          empty: {
-	            title: 'No Orders',
-	            description: 'You have no orders yet.'
-	          }
-	        }"
-	        :store="{
-	          read: (options) => orders.actions.read(options),
-	          state: orders.state
-	        }"
-	        :options="{
-	            customer: auth.state.user._id,
-	            limit: 5,
-	            page: 1
-	        }"
-	        v-slot="{
-	          items
-	        }"
-	        class="cols-1 gap-thin"
-	      >
+					:showLoadMore="false"
+					:states="{
+						empty: {
+							title: 'No Orders',
+							description: 'You have no orders yet.'
+						}
+					}"
+					:store="{
+						read: (options) => orders.actions.read(options),
+						state: orders.state
+					}"
+					:options="{
+						customer: auth.state.user._id,
+						limit: 5,
+						page: 1
+					}"
+					v-slot="{ items }"
+				>
 					<Table
-						class="radius-semi bg-white"
+						class="radius-small bg-white"
 						:items="items"
-						:columns="[{
-					    key: '_id',
-					    label: 'ID',
-							formatter: (value) => `#${value.slice(0, 4)}...${value.slice(-4)}`
-					  },
-					  {
-					    key: 'positions',
-					    label: 'Items',
-					    formatter: (value) => value?.length || 0
-					  },
-					  {
-					    key: 'status',
-					    label: 'Status',
-					    component: StatusBadge
-					  },
-					  {
-					    key: 'createdAt',
-					    label: 'Date',
-					    formatter: (value) => new Date(value).toLocaleDateString()
-					  }]"
-					/>
-	      </Feed>
-
+						:columns="columns.orders"
+					>
+						<template #cell-_id="{ value }">
+							<span class="t-dark fw-medium">#{{ formatId(value) }}</span>
+						</template>
+						<template #cell-positions="{ value }">
+							<span class="t-dark">{{ value?.length || 0 }} items</span>
+						</template>
+						<template #cell-status="{ value }">
+							<span
+								class="pd-thin pd-l-small pd-r-small radius-small t-small fw-medium"
+								:class="getStatusClass(value)"
+							>
+								{{ value }}
+							</span>
+						</template>
+						<template #cell-createdAt="{ value }">
+							<span class="t-grey t-small">{{ formatDate(value) }}</span>
+						</template>
+					</Table>
+				</Feed>
 			</Block>
 
-			<Block
-				title="Upcoming Events"
-				class="pos-relative"
-			>
+			<!-- Upcoming Events -->
+			<Block title="Upcoming Events">
 				<Feed
-	        :showLoadMore="false"
-	        :LoadMore="false"
-	        :states="{
-	          empty: {
-	            title: 'No Events',
-	            description: 'You have no upcoming events.'
-	          }
-	        }"
-	        :store="{
-	          read: (options) => events.read(options),
-	        }"
-	        :options="{
-	            creator: auth.state.user._id,
-	            sortParam: 'date.start',
-	            sortOrder: 'asc',
-	            limit: 5,
-	            page: 1
-	        }"
-	        v-slot="{
-	          items
-	        }"
-	        class="cols-1 gap-thin"
-	      >
-					<CardEvent
-	          v-for="event in items"
-	          :key="event._id"
-	          :event="event"
-	          :user="auth.state.user._id"
-	          :type="'compact'"
-	          class="bg-light radius-medium"
-	        />
-	      </Feed>
+					:showLoadMore="false"
+					:states="{
+						empty: {
+							title: 'No Events',
+							description: 'You have no upcoming events.'
+						}
+					}"
+					:store="{
+						read: (options) => events.read(options)
+					}"
+					:options="{
+						creator: auth.state.user._id,
+						sortParam: 'date.start',
+						sortOrder: 'asc',
+						limit: 5,
+						page: 1
+					}"
+					v-slot="{ items }"
+					class="flex flex-column gap-thin"
+				>
+					<router-link
+						v-for="event in items"
+						:key="event._id"
+						:to="`/events/${event._id}`"
+						class="d-block bg-white pd-small radius-small hover-scale-1 transition-default"
+					>
+						<div class="flex flex-v-center gap-small">
+							<div
+								class="flex-none w-3r h-3r radius-small bg-main-transp flex flex-center o-hidden"
+							>
+								<img
+									v-if="event.cover"
+									:src="(FILE_SERVER_URL || '') + event.cover"
+									class="w-100 h-100 object-fit-cover"
+									alt=""
+								/>
+								<IconEvents v-else class="i-regular" :fill="'rgb(var(--main))'"/>
+							</div>
+							<div class="flex-child o-hidden">
+								<p class="fw-medium t-truncate mn-b-nano">{{ event.name }}</p>
+								<p class="t-grey t-small">{{ formatEventDate(event.date) }}</p>
+							</div>
+							<div class="flex-none">
+								<span
+									class="pd-thin pd-l-small pd-r-small radius-small t-small fw-medium"
+									:class="getEventStatusClass(event.date)"
+								>
+									{{ getEventStatus(event.date) }}
+								</span>
+							</div>
+						</div>
+					</router-link>
+				</Feed>
 			</Block>
 		</div>
-
 	</div>
-
-
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router'
+import { ref, onMounted, inject } from 'vue'
+import { useRouter } from 'vue-router'
 
 import Block from '@martyrs/src/components/Block/Block.vue'
 import Feed from '@martyrs/src/components/Feed/Feed.vue'
 import Table from '@martyrs/src/components/Table/Table.vue'
-import StatusBadge from '@martyrs/src/components/Table/StatusBadge.vue'
-
-import CardEvent from '@martyrs/src/modules/events/components/blocks/CardEvent.vue';
 
 import IconGroups from '@martyrs/src/modules/icons/entities/IconGroups.vue'
 import IconEvents from '@martyrs/src/modules/icons/entities/IconEvents.vue'
 import IconOrders from '@martyrs/src/modules/icons/entities/IconOrders.vue'
 
-import * as auth  from '@martyrs/src/modules/auth/views/store/auth.js'
-import * as orders  from '@martyrs/src/modules/orders/store/orders.js'
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
+import * as orders from '@martyrs/src/modules/orders/store/orders.js'
 import * as events from '@martyrs/src/modules/events/store/events.js'
 
-const route = useRoute()
+const FILE_SERVER_URL = inject('FILE_SERVER_URL', '')
 const router = useRouter()
 
 const stats = ref({
-  organizations: 0,
-  orders: 0,
-  events: 0
+	organizations: 0,
+	orders: 0,
+	events: 0
 })
 
+const columns = {
+	orders: [
+		{ key: '_id', label: 'Order' },
+		{ key: 'positions', label: 'Items' },
+		{ key: 'status', label: 'Status' },
+		{ key: 'createdAt', label: 'Date' }
+	]
+}
+
+// Formatters
+const formatId = (id) => id ? `${id.slice(0, 4)}...${id.slice(-4)}` : ''
+
+const formatDate = (date) => {
+	if (!date) return ''
+	return new Date(date).toLocaleDateString()
+}
+
+const formatEventDate = (date) => {
+	if (!date?.start) return ''
+	const start = new Date(date.start)
+	return start.toLocaleDateString(undefined, { day: '2-digit', month: 'short', year: 'numeric' })
+}
+
+const getStatusClass = (status) => {
+	const classes = {
+		pending: 'bg-second-transp t-second',
+		processing: 'bg-main-transp t-main',
+		completed: 'bg-green-transp t-green',
+		cancelled: 'bg-red-transp t-red'
+	}
+	return classes[status] || 'bg-light t-grey'
+}
+
+const getEventStatus = (date) => {
+	if (!date?.start) return 'No date'
+	const now = new Date()
+	const start = new Date(date.start)
+	const end = date.end ? new Date(date.end) : start
+
+	if (now > end) return 'Finished'
+	if (now >= start && now <= end) return 'Live'
+
+	const diffDays = Math.ceil((start - now) / (1000 * 60 * 60 * 24))
+	if (diffDays <= 1) return 'Tomorrow'
+	if (diffDays <= 7) return `In ${diffDays} days`
+	return 'Upcoming'
+}
+
+const getEventStatusClass = (date) => {
+	const status = getEventStatus(date)
+	if (status === 'Finished') return 'bg-light t-grey'
+	if (status === 'Live') return 'bg-green-transp t-green'
+	if (status === 'Tomorrow') return 'bg-second-transp t-second'
+	return 'bg-main-transp t-main'
+}
+
 onMounted(async () => {
-  // Load user stats if needed
+	// Load stats
+	try {
+		const [orgsData, ordersData, eventsData] = await Promise.all([
+			// Load counts if needed
+		])
+	} catch (e) {
+		console.error('Failed to load dashboard stats:', e)
+	}
 })
 </script>