@ozdao/martyrs 0.2.603 → 0.2.605

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

@@ -2,7 +2,7 @@
 	<section class="t-left pd-medium">
 		<!-- Header -->
 		<h3 class="mn-b-small">You have been invited to the organization</h3>
-		<p class="mn-b-semi t-transp">Please provide a password to complete the registration.</p>
+		<p class="mn-b-semi opacity-50">Please provide a password to complete the registration.</p>
 		
 		<!-- Form -->
 		<div  class="mn-b-semi radius-small o-hidden">

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

@@ -74,7 +74,7 @@
 							_id: auth.state.user._id
 						}
 					})" 
-					class="cursor-pointer pos-absolute pos-t-regular pos-r-regular i-medium t-transp"
+					class="cursor-pointer pos-absolute pos-t-regular pos-r-regular i-medium opacity-50"
 				/>
 
 				<div class="pos-relative mn-b-small">

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

@@ -1,6 +1,21 @@
 <template>
-  <Popup 
-    :isPopupOpen="isOpen" 
+  <!-- Backoffice: inline layout -->
+  <div v-if="isBackoffice" class="w-100 pd-medium">
+    <div v-if="loading" class="flex-center h-20r">
+      <Loader :centered="true"/>
+    </div>
+
+    <div v-else class="flex h-min-100 flex-row mobile:flex-column gap-regular">
+      <ProfileEditSidebar class="w-10r mobile:w-100 flex-shrink-0" />
+
+      <RouterView :userData="userData" />
+    </div>
+  </div>
+
+  <!-- Client: popup layout -->
+  <Popup
+    v-else
+    :isPopupOpen="isOpen"
     @close-popup="closeProfileEdit()"
     title="Edit Profile"
     align="center center"
@@ -9,10 +24,10 @@
     <div v-if="loading" class="flex-center h-100">
       <Loader :centered="true"/>
     </div>
-    
+
     <div v-else class="flex h-min-100 flex-row mobile:flex-column gap-regular">
       <ProfileEditSidebar class="w-10r mobile:w-100 flex-shrink-0" />
-      
+
       <RouterView :userData="userData" />
     </div>
   </Popup>
@@ -23,7 +38,7 @@
   import Loader from '@martyrs/src/components/Loader/Loader.vue'
   import ProfileEditSidebar from './ProfileEditSidebar.vue'
   
-  import { ref, onMounted, provide } from 'vue'
+  import { ref, computed, onMounted, provide } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
   
   const route = useRoute()
@@ -35,18 +50,12 @@
   const loading = ref(true)
   const userData = ref(null)
   const isOpen = ref(false)
+  const isBackoffice = computed(() => route.matched.some(r => r.meta?.context === 'backoffice'))
 
   function closeProfileEdit () {
     isOpen.value = false
-    router.push({ 
-      name: 'User Profile', 
-      params: { 
-        _id: auth.state.user._id 
-      },
-      query: { 
-        afterAuth: 'true' 
-      }
-    })
+    const basePath = route.path.replace(/\/(account)?$/, '') || route.path
+    router.push({ path: basePath, query: { afterAuth: 'true' } })
   }
   
   onMounted(async () => {

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

@@ -2,10 +2,10 @@
   <div class="for-transition w-100">
     <!-- Phone and Email -->
     <div class="bg-white mn-b-thin">
-      <h3 class="mn-b-small">Phone and Email</h3>
+      <h3 class="mn-b-small">{{ !(core.state?.options?.auth?.authMethodsExclude || []).includes('phone') ? 'Phone and Email' : 'Email' }}</h3>
 
       <!-- Phone -->
-      <div class="mn-b-semi">
+      <div v-if="!(core.state?.options?.auth?.authMethodsExclude || []).includes('phone')" class="mn-b-semi">
         <Field
           v-if="users.state.current.phone && !isEditingPhone"
           v-model:field="users.state.current.phone"
@@ -106,37 +106,51 @@
     </div>
 
     <!-- Settings -->
-    <div class="bg-white mn-b-thin">
-      <h3 class="mn-b-small">Settings</h3>
-      <Checkbox
-        :label="'Darkmode'"
-        :radio="core.state.theme.mode === 'dark'"
-        @update:radio="() => core.actions.toggleTheme()"
-        class="w-100 bg-light t-black pd-medium radius-small"
-      />
-    </div>
+    <Block title="Settings" class="mn-b-thin">
+      <div class="flex flex-column gap-thin">
+        <Checkbox
+          :label="'Darkmode'"
+          :radio="core.state.theme.mode === 'dark'"
+          @update:radio="() => core.actions.toggleTheme()"
+          class="w-100 bg-white t-black pd-medium radius-small"
+        />
+
+        <Button
+          :submit="onSubmit"
+          :callback="redirectTo"
+          class="bg-main w-100"
+        >
+          Save
+        </Button>
+      </div>
+    </Block>
+
+    <!-- Account Actions -->
+    <Block title="Account" class="mn-b-thin">
+      <div class="flex flex-column gap-thin">
+        <Button
+          :submit="logout"
+          class="w-100 bg-white t-red br-1px br-light radius-small"
+        >
+          Logout
+        </Button>
 
-    <Button
-      :submit="onSubmit"
-      :callback="redirectTo"
-      class="mn-b-thin bg-main w-100"
-    >
-      Save
-    </Button>
-
-    <Button
-      :submit="onSubmitDelete"
-      :callback="() => router.push({ name: 'Sign In' })"
-      class="mn-b-thin w-100 bg-red t-white"
-    >
-      Delete Account
-    </Button>
+        <Button
+          :submit="onSubmitDelete"
+          :callback="() => router.push({ name: 'Sign In' })"
+          class="w-100 bg-red t-white radius-small"
+        >
+          Delete Account
+        </Button>
+      </div>
+    </Block>
   </div>
 </template>
 
 <script setup>
 import Checkbox from '@martyrs/src/components/Checkbox/Checkbox.vue'
 import Button from '@martyrs/src/components/Button/Button.vue'
+import Block from '@martyrs/src/components/Block/Block.vue'
 import Field from '@martyrs/src/components/Field/Field.vue'
 import FieldPhone from '@martyrs/src/components/FieldPhone/FieldPhone.vue'
 
@@ -220,6 +234,11 @@ async function onSubmitDelete() {
   auth.actions.logout()
 }
 
+function logout() {
+  auth.actions.logout()
+  router.push({ name: 'Sign In' })
+}
+
 function redirectTo() {
   router.back()
 }

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

@@ -1,18 +1,18 @@
 <template>
   <nav class="flex flex-column mobile:flex-row bg-light pd-medium radius-small">
-    <RouterLink 
-      :to="{ name: 'Profile Edit Profile', params: { _id: userId } }"
+    <RouterLink
+      :to="basePath"
       class="flex flex-v-center pd-small mn-b-thin radius-small hover:bg-white"
-      :class="{ 'bg-white': route.name === 'Profile Edit Profile' }"
+      :class="{ 'bg-white': !route.path.endsWith('/account') }"
     >
       <IconProfile class="mn-r-thin i-medium"/>
       <span>Profile</span>
     </RouterLink>
-    
-    <RouterLink 
-      :to="{ name: 'Profile Edit Account', params: { _id: userId } }"
+
+    <RouterLink
+      :to="basePath + '/account'"
       class="flex flex-v-center pd-small radius-small hover:bg-white"
-      :class="{ 'bg-white': route.name === 'Profile Edit Account' }"
+      :class="{ 'bg-white': route.path.endsWith('/account') }"
     >
       <IconLock class="mn-r-thin i-medium"/>
       <span>Account</span>
@@ -28,4 +28,5 @@
   import IconLock from '@martyrs/src/modules/icons/entities/IconLock.vue';
   const route = useRoute()
   const userId = computed(() => route.params._id || auth.state.user._id)
+  const basePath = computed(() => route.path.replace(/\/account$/, ''))
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <section class="t-left pd-medium">
     <h3 class="mn-b-small">{{ t('auth.resetPassword.forgotPasswordTitle') }}</h3>
-    <p class="mn-b-small t-transp">{{ t('auth.resetPassword.instructions') }}</p>
+    <p class="mn-b-small opacity-50">{{ t('auth.resetPassword.instructions') }}</p>
 
     <!-- Tab selector -->
     <div
@@ -20,7 +20,7 @@
       <!-- Phone -->
       <transition name="slide-fade">
         <div v-if="tabAuth === 'phone'" class="mn-b-semi radius-small">
-          <p class="mn-b-small t-transp">{{ t('auth.resetPassword.smsInfo') }}</p>
+          <p class="mn-b-small opacity-50">{{ t('auth.resetPassword.smsInfo') }}</p>
           <FieldPhone
             @change="(event) => identifier = event"
             :dropdownOptions="{
@@ -38,7 +38,7 @@
       <!-- Email -->
       <transition name="slide-fade">
         <div v-if="tabAuth === 'email'" class="mn-b-semi radius-small o-hidden">
-          <p class="mn-b-small t-transp">{{ t('auth.resetPassword.emailInfo') }}</p>
+          <p class="mn-b-small opacity-50">{{ t('auth.resetPassword.emailInfo') }}</p>
           <Field
             v-model:field="identifier"
             :placeholder="t('auth.resetPassword.emailPlaceholder')"
@@ -160,7 +160,7 @@ async function onSubmit() {
     // Success - save token and redirect
     if (result.data?.accessToken) {
       const Cookies = (await import('js-cookie')).default
-      Cookies.set('user', JSON.stringify(result.data), { path: '/', expires: 7 })
+      Cookies.set('user', JSON.stringify(result.data), { path: '/', expires: 30 })
       await auth.actions.initialize()
       router.push({ name: 'User Profile', params: { _id: result.data._id } })
     } else {

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

@@ -19,7 +19,7 @@
       <!-- Phone -->
       <transition name="slide-fade">
         <div v-show="tabAuth === 'phone'" class="mn-b-semi radius-small">
-          <p class="mn-b-small t-transp">{{ t('auth.signUp.smsNotice') }}</p>
+          <p class="mn-b-small opacity-50">{{ t('auth.signUp.smsNotice') }}</p>
           <FieldPhone
             @change="(event) => phone = event"
             :dropdownOptions="{
@@ -37,7 +37,7 @@
       <!-- Email -->
       <transition name="slide-fade">
         <div v-show="tabAuth === 'email'" class="mn-b-semi radius-small o-hidden">
-          <p class="mn-b-small t-transp">{{ t('auth.signUp.emailNotice') }}</p>
+          <p class="mn-b-small opacity-50">{{ t('auth.signUp.emailNotice') }}</p>
           <Field
             v-model:field="email"
             :placeholder="t('auth.signUp.emailPlaceholder')"
@@ -177,7 +177,7 @@ async function onSubmit() {
     // Success - save token and redirect
     if (result.data?.accessToken) {
       const Cookies = (await import('js-cookie')).default
-      Cookies.set('user', JSON.stringify(result.data), { path: '/', expires: 7 })
+      Cookies.set('user', JSON.stringify(result.data), { path: '/', expires: 30 })
       await auth.actions.initialize()
 
       if (route.query.returnUrl) {

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

@@ -5,6 +5,7 @@
 		<!-- Stats Cards -->
 		<div class="mn-b-medium cols-3 mobile:cols-1 gap-small">
 			<router-link
+				v-if="isModuleInstalled('organizations')"
 				:to="`/users/${auth.state.user._id}/organizations`"
 				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
 			>
@@ -18,6 +19,7 @@
 			</router-link>
 
 			<router-link
+				v-if="isModuleInstalled('orders')"
 				:to="`/users/${auth.state.user._id}/orders`"
 				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
 			>
@@ -31,6 +33,7 @@
 			</router-link>
 
 			<router-link
+				v-if="isModuleInstalled('events')"
 				:to="`/users/${auth.state.user._id}/events`"
 				class="d-block bg-light pd-medium radius-medium hover-scale-1 transition-default"
 			>
@@ -45,9 +48,9 @@
 		</div>
 
 		<!-- Content Grid -->
-		<div class="cols-2 mobile:cols-1 gap-small">
+		<div v-if="isModuleInstalled('orders') || isModuleInstalled('events')" class="cols-2 mobile:cols-1 gap-small">
 			<!-- Recent Orders -->
-			<Block title="Recent Orders">
+			<Block v-if="isModuleInstalled('orders')" title="Recent Orders">
 				<Feed
 					:showLoadMore="false"
 					:states="{
@@ -94,7 +97,7 @@
 			</Block>
 
 			<!-- Upcoming Events -->
-			<Block title="Upcoming Events">
+			<Block v-if="isModuleInstalled('events')" title="Upcoming Events">
 				<Feed
 					:showLoadMore="false"
 					:states="{
@@ -160,7 +163,7 @@ 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 { formatDate } = useGlobalMixins()
+const { formatDate, isModuleInstalled } = useGlobalMixins()
 
 const stats = ref({
 	organizations: 0,
@@ -182,7 +185,7 @@ const getStatusClass = (status) => {
 		pending: 'bg-second-transp t-second',
 		processing: 'bg-main-transp t-main',
 		completed: 'bg-green-transp t-green',
-		cancelled: 'bg-red-transp t-red'
+		canceled: 'bg-red-transp t-red'
 	}
 	return classes[status] || 'bg-light t-dark'
 }

package/src/modules/auth/views/components/sections/FeaturedUsers.vue

@@ -84,7 +84,7 @@ import * as users from '@martyrs/src/modules/auth/views/store/users.js'
 
 import Marquee from '@martyrs/src/components/Marquee/Marquee.vue'
 
-import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'
+import CardUser from '@martyrs/src/modules/core/views/components/blocks/CardUser.vue'
 
 const usersList = ref([])
 

package/src/modules/auth/views/components/sections/SliderFeatures.vue

@@ -16,7 +16,7 @@ const features = computed(() => tm('auth.features'))
       <div class="h-100 background-div" :style="`background-image: url(/features/${index}.png);`"></div>
       <div class="h-100 pd-big">
         <h5 class="t-center w-100 mn-b-regular">{{ feature.title }}</h5>
-        <p class='t-center t-transp w-100'>{{ feature.description }}</p>
+        <p class='t-center opacity-50 w-100'>{{ feature.description }}</p>
       </div>
     </div>
   </Slider>

package/src/modules/auth/views/middlewares/auth.validation.js

@@ -45,16 +45,21 @@ function requiresAuth(to, from, next) {
   const isLogin = auth.state.access.status;
 
   if (isLogin !== true) {
-    return next('/auth/signin');
+    return next({ path: '/auth/signin', query: { returnUrl: to.fullPath } });
   }
 
   next();
 }
 
 async function requiresAdmin(to, from, next) {
+  const isLoggedIn = auth.state.access.status;
   const isAdmin = auth.state.access.roles?.includes('ROLE_ADMIN') ? auth.state.access.roles.includes('ROLE_ADMIN') : false;
 
-  if (isAdmin !== true) {
+  if (!isLoggedIn) {
+    return next({ path: '/auth/signin', query: { returnUrl: to.fullPath } });
+  }
+
+  if (!isAdmin) {
     return next('/401');
   }
 

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

@@ -0,0 +1,39 @@
+const usersBackofficeRoutes = [
+  {
+    path: '',
+    name: 'Users',
+    meta: {
+      title: {
+        en: 'Users',
+        ru: 'Пользователи',
+      },
+      authorize: [],
+    },
+    component: () => import(/* webpackChunkName: 'BackofficeUsers' */ '../components/pages/BackofficeUsers.vue'),
+  },
+  {
+    path: ':_id',
+    name: 'User Profile',
+    meta: {
+      title: {
+        en: 'Profile Settings',
+        ru: 'Настройки профиля',
+      },
+    },
+    component: () => import(/* webpackChunkName: 'BackofficeUserProfileEdit' */ '../components/pages/ProfileEdit.vue'),
+    children: [
+      {
+        path: '',
+        name: 'Profile Edit Profile',
+        component: () => import(/* webpackChunkName: 'BackofficeUserProfileEditProfile' */ '../components/pages/ProfileEditProfile.vue'),
+      },
+      {
+        path: 'account',
+        name: 'Profile Edit Account',
+        component: () => import(/* webpackChunkName: 'BackofficeUserProfileEditAccount' */ '../components/pages/ProfileEditAccount.vue'),
+      },
+    ],
+  },
+];
+
+export default usersBackofficeRoutes;

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

@@ -215,9 +215,9 @@ const actions = {
 
 // Cookies
 const optionsDefault = {
-  development: { path: '/', domain: process.env.DOMAIN_URL, secure: false, expires: 7, sameSite: 'Lax' },
+  development: { path: '/', domain: process.env.DOMAIN_URL, secure: false, expires: 30, sameSite: 'Lax' },
   production: {
-    expires: 7,
+    expires: 30,
     path: '/',
     domain: process.env.DOMAIN_URL,
     sameSite: 'strict',

package/src/modules/backoffice/components/admin/Backcalls.vue

@@ -18,13 +18,13 @@
       <div class="flex block">
         <div>
           <p> Запрос от {{backcall.phone}} </p> 
-          <p  class="t-transp">Добавлен в {{DateToFormattedString(backcall.createdAt)}}</p>
+          <p  class="opacity-50">Добавлен в {{DateToFormattedString(backcall.createdAt)}}</p>
           
         </div>
 
         <div>
           <p>Интересуемый товар</p>
-          <p class="t-transp">
+          <p class="opacity-50">
             <router-link v-if="backcall.product" :to="{ name: 'Product', params: { _id: backcall.product}}">
               Товар #{{backcall.product.slice(0,8)}}
             </router-link>

package/src/modules/backoffice/components/admin/Dashboard.sublime-workspace

@@ -117,7 +117,7 @@
 			],
 			[
 				"t-",
-				"t-transp"
+				"opacity-50"
 			],
 			[
 				"mar",

package/src/modules/backoffice/components/admin/FastOrders.vue

@@ -17,13 +17,13 @@
         <div class="flex-wrap flex ">
           <div>
             <p> Запрос от {{fastorder.phone ? fastorder.phone : fastorder.userid}} </p> 
-            <p  class="t-transp">Добавлен в {{DateToFormattedString(fastorder.createdAt)}}</p>
+            <p  class="opacity-50">Добавлен в {{DateToFormattedString(fastorder.createdAt)}}</p>
             
           </div>
 
           <div>
             <p>Интересуемый товар</p>
-            <p class="t-transp">
+            <p class="opacity-50">
               <router-link v-if="fastorder.product" :to="{ name: 'Product', params: { _id: fastorder.product}}">
                 Товар #{{fastorder.product.slice(0,8)}}
               </router-link>
@@ -53,7 +53,7 @@
               <div  v-for="position in fastorder.products" class="w-100 mn-b-thin flex"> 
                 <div class=" w-50 flex">
                   <span>
-                    <!-- <span class="t-transp">Название:</span>  -->
+                    <!-- <span class="opacity-50">Название:</span>  -->
                     {{position.name}}
                   </span>
                 </div>

package/src/modules/backoffice/components/admin/UserEdit.vue

@@ -2,7 +2,7 @@
   <section class="section-header section">
     <div class="title">
       <h1 class="mn-b-regular">Редактировать пользователя</h1>
-       <p class="t-transp w-100 h3">
+       <p class="opacity-50 w-100 h3">
         #{{user._id}} 
       </p>
     </div>