@ozdao/martyrs 0.2.601 → 0.2.603

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

@@ -10,7 +10,7 @@
 		</h3>
 
 		<p class="mn-b-big">
-			<router-link :to="{name: 'Sign Up', query: { returnUrl: route.query?.returnUrl}}" class="underline t-grey">{{ t('auth.signIn.signup') }}</router-link>
+			<router-link :to="{name: 'Sign Up', query: { returnUrl: route.query?.returnUrl}}" class="underline t-dark">{{ t('auth.signIn.signup') }}</router-link>
 		</p>
 		
 		<!-- Select -->
@@ -112,6 +112,7 @@ 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 { mixins } from '@martyrs/src/modules/core/core.client.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'
@@ -119,6 +120,7 @@ import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/i
 // Get store
 const store = useStore()
 const core = store.core
+const { isModuleInstalled } = mixins.useGlobalMixins()
 
 // Init validation
 const phoneValidation = ref(null)
@@ -220,6 +222,13 @@ function redirectTo () {
 				afterAuth: 'true'
 			}
 		})
+	} else if (auth.state.access.roles?.includes('ROLE_ADMIN') && isModuleInstalled('backoffice')) {
+		router.push({
+			path: '/backoffice',
+			query: {
+				afterAuth: 'true'
+			}
+		})
 	} else {
 		router.push({
 			name: 'User Profile',

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

@@ -12,7 +12,7 @@
 					<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>
+					<span class="t-dark t-small">My Groups</span>
 				</div>
 				<p class="h2 fw-semi">{{ stats.organizations || 0 }}</p>
 			</router-link>
@@ -25,7 +25,7 @@
 					<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>
+					<span class="t-dark t-small">My Orders</span>
 				</div>
 				<p class="h2 fw-semi">{{ stats.orders || 0 }}</p>
 			</router-link>
@@ -38,7 +38,7 @@
 					<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>
+					<span class="t-dark t-small">My Events</span>
 				</div>
 				<p class="h2 fw-semi">{{ stats.events || 0 }}</p>
 			</router-link>
@@ -70,7 +70,7 @@
 					<Table
 						class="radius-small bg-white"
 						:items="items"
-						:columns="columns.orders"
+						:columns="orderColumns"
 					>
 						<template #cell-_id="{ value }">
 							<span class="t-dark fw-medium">#{{ formatId(value) }}</span>
@@ -87,7 +87,7 @@
 							</span>
 						</template>
 						<template #cell-createdAt="{ value }">
-							<span class="t-grey t-small">{{ formatDate(value) }}</span>
+							<span class="t-dark t-small">{{ formatDate(value, { dateOnly: true }) }}</span>
 						</template>
 					</Table>
 				</Feed>
@@ -116,38 +116,27 @@
 					v-slot="{ items }"
 					class="flex flex-column gap-thin"
 				>
-					<router-link
+					<Card
 						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"
+						:to="`/events/${event.url || event._id}`"
+						:photo="event.cover"
+						:placeholder="IconEvents"
+						:title="event.name"
+						:subtitle="formatDate(event.date?.start, { dateOnly: true })"
+						classImage="flex-none w-3r h-3r radius-small bg-main-transp flex flex-center o-hidden"
+						classContent="flex-child o-hidden"
+						class="bg-white pd-small radius-small hover-scale-1 transition-default flex flex-v-center gap-small"
 					>
-						<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"
+						<template #actions>
+							<span
+								class="flex-none pd-thin pd-l-small pd-r-small radius-small t-small fw-medium"
+								:class="getEventStatusClass(event.date)"
 							>
-								<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>
+								{{ getEventStatus(event.date) }}
+							</span>
+						</template>
+					</Card>
 				</Feed>
 			</Block>
 		</div>
@@ -155,23 +144,23 @@
 </template>
 
 <script setup>
-import { ref, onMounted, inject } from 'vue'
-import { useRouter } from 'vue-router'
+import { ref, onMounted } from 'vue'
 
 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 Card from '@martyrs/src/modules/core/views/components/blocks/Card.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 IconEvents from '@martyrs/src/modules/icons/entities/IconEvents.vue'
 
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.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 FILE_SERVER_URL = inject('FILE_SERVER_URL', '')
-const router = useRouter()
+const { formatDate } = useGlobalMixins()
 
 const stats = ref({
 	organizations: 0,
@@ -179,29 +168,15 @@ const stats = ref({
 	events: 0
 })
 
-const columns = {
-	orders: [
-		{ key: '_id', label: 'Order' },
-		{ key: 'positions', label: 'Items' },
-		{ key: 'status', label: 'Status' },
-		{ key: 'createdAt', label: 'Date' }
-	]
-}
+const orderColumns = [
+	{ 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',
@@ -209,7 +184,7 @@ const getStatusClass = (status) => {
 		completed: 'bg-green-transp t-green',
 		cancelled: 'bg-red-transp t-red'
 	}
-	return classes[status] || 'bg-light t-grey'
+	return classes[status] || 'bg-light t-dark'
 }
 
 const getEventStatus = (date) => {
@@ -217,10 +192,8 @@ const getEventStatus = (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`
@@ -229,7 +202,7 @@ const getEventStatus = (date) => {
 
 const getEventStatusClass = (date) => {
 	const status = getEventStatus(date)
-	if (status === 'Finished') return 'bg-light t-grey'
+	if (status === 'Finished') return 'bg-light t-dark'
 	if (status === 'Live') return 'bg-green-transp t-green'
 	if (status === 'Tomorrow') return 'bg-second-transp t-second'
 	return 'bg-main-transp t-main'

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

@@ -2,7 +2,6 @@
 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';
@@ -90,49 +89,6 @@ export function getUsersRoutes(options = {}) {
               },
               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'),
-            },
             ],
         },
       ],