@ozdao/prometheus-framework 0.0.95 → 0.0.97

package/src/components/Magnifier/Magnifier.vue

@@ -7,7 +7,7 @@
     @touchmove="handleTouchMove"
     @touchend="handleTouchEnd"
   >
-    <img :src="imageSrc" class="w-100" />
+    <img :src="(FILE_SERVER_URL || '') + imageSrc" class="w-100" />
     <div v-if="zoomVisible" class="zoom-lens" :style="zoomLensStyle"></div>
   </div>
 </template>

package/src/components/Text/Text.vue

@@ -1,17 +1,18 @@
 <template>
   <span @click="toggleShow" class="">
     {{ shownText }}
-    <span v-if="isTruncated" class="cursor-pointer t-second">{{ showMoreText }}</span>
+    <span v-if="isTruncated && showToggleText" class="cursor-pointer t-second">{{ showMoreText }}</span>
   </span>
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
 
-// Максимальная длина и текст, передаваемые как параметры
+// Максимальная длина, текст и опциональный параметр отображения текста переключателя, передаваемые как параметры
 const props = defineProps({
   maxLen: { type: Number, required: true },
-  text:   { type: String, required: true }
+  text:   { type: String, required: true },
+  showToggleText: { type: Boolean, default: false }
 })
 
 // Управление показом полного текста

package/src/components/UploadImage/UploadImage.vue

@@ -4,12 +4,19 @@
     @drop="onDrop"
     @dragover.prevent
     class="image-upload-area flex-v-center flex-h-center flex">
-      <img v-if="imageUrl || photo" :src="imageUrl || photo" alt="Uploaded image" class="w-100 h-100 object-fit-fill"/>
+      <img 
+        v-if="imageUrl || photo" 
+        :src="(FILE_SERVER_URL || '') + (imageUrl || photo)"
+        alt="Uploaded image" 
+        class="w-100 h-100 object-fit-fill"
+        />
+      
       <div v-else class="flex-v-center flex-h-center flex w-100 h-100 bg-second" >
         <svg class="i-medium" width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path  fill="white" d="M21.2784 37.2973C18.8466 34.6628 18.8466 30.6098 21.2784 27.9753L47.2179 2.03584C48.6364 0.81993 50.2577 0.211974 51.8789 0.211974C53.5001 0.211974 55.1213 0.81993 56.5399 2.03584L82.4793 27.9753C84.9111 30.6098 84.9111 34.6628 82.4793 37.2973C79.8448 39.7291 75.7918 39.7291 73.1573 37.2973L58.3637 22.301V71.5454C58.3637 75.1932 55.5266 78.0303 51.8789 78.0303C48.2311 78.0303 45.394 75.1932 45.394 71.5454V22.301L30.6004 37.2973C27.966 39.7291 23.9129 39.7291 21.2784 37.2973ZM97.2729 71.5454C100.921 71.5454 103.758 74.3825 103.758 78.0303V97.4849C103.758 101.133 100.921 103.97 97.2729 103.97H6.48486C2.83713 103.97 0 101.133 0 97.4849V78.0303C0 74.3825 2.83713 71.5454 6.48486 71.5454H38.9092C38.9092 78.6382 44.7861 84.5151 51.8789 84.5151C58.9717 84.5151 64.8486 78.6382 64.8486 71.5454H97.2729ZM87.5456 92.6212C90.1801 92.6212 92.4092 90.392 92.4092 87.7576C92.4092 85.1231 90.1801 82.8939 87.5456 82.8939C84.9111 82.8939 82.682 85.1231 82.682 87.7576C82.682 90.392 84.9111 92.6212 87.5456 92.6212Z"/>
         </svg>
       </div>
+      
       <input type="file" ref="fileInput" @change="onFileChange" style="display: none"/>
   </div>
 </template>

package/src/modules/backoffice/components/pages/Organizations.vue

@@ -20,7 +20,7 @@
 	        class="mn-small radius-medium pd-medium br-2px br-solid br-grey"
 	        @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
 	      >	
-	        <img v-if="organization.profile.photo.length > 0" :src="organization.profile.photo" class="radius-medium mn-small i-thin" />
+	        <img v-if="organization.profile.photo.length > 0" :src="(FILE_SERVER_URL || '') + organization.profile.photo" class="radius-medium mn-small i-thin" />
 					<img v-else class="radius-medium mn-small i-thin" src="@/assets/images/avatar.svg">
 	        
 	        <p class="h4 mn-r-semi mn-small">{{organization.profile.name}}</p>
@@ -76,7 +76,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -3,6 +3,19 @@
 		class="bg-grey radius-big"
 	>
 
+
+		<IconEdit
+			v-if="user === blogpost.creator.target._id"
+			@click.stop="$router.push({
+				name: 'Edit BlogPost', 
+				params: {
+					url: blogpost.url
+				}
+			})" 
+			class="z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+		/>
+
+
 		<CardHeader 
 		    :class="{
 		    	'mn-small pd-medium': type !== 'short',
@@ -18,7 +31,7 @@
 			v-if="firstImage && firstImage.content && type !== 'blogpostPage'"
 		>
 			<img 
-				:src="firstImage.content" 
+				:src="(FILE_SERVER_URL || '') + firstImage.content" 
 				alt="Blog post image" 
 				class="mn-medium object-fit-cover w-100 h-20r"
 			/>
@@ -27,6 +40,7 @@
 		<section
 			class="pd-t-zero pd-medium"
 		>
+			
 			<div v-if="type !== 'blogpostPage'" class="cursor-pointer mn-thin flex-nowrap flex w-100">
 
 				<h3
@@ -79,6 +93,7 @@
 
 	import Chips  from '@pf/src/components/Chips/Chips.vue'
 
+	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
 	import { computed } from 'vue'
 

package/src/modules/community/components/layouts/Community.vue

@@ -23,8 +23,8 @@
     	</h2>
 		</header>
 		
-		<ul class="bg-grey pd-medium radius-big mn-semi flex-nowrap flex">
-						<li  	
+		<ul class="w-max bg-grey pd-medium radius-big mn-semi flex-nowrap flex">
+			<li  	
 			:class="{'t-white bg-black': route.params.category === 'featured' }" 					
 			@click="router.push({name: 'Blog'})" 
 			class="mn-r-small t-medium  pd-small radius-small">👑 Featured</li>

package/src/modules/community/components/pages/Blog.vue

@@ -66,7 +66,7 @@
     Object.assign(query, newQueryValues);
 
     // Обновляем маршрут с новым query
-    router.push({ query });
+    router.replace({ query });
   }, { deep: true })
 </script>
 

package/src/modules/community/router/blogposts.js

@@ -8,11 +8,19 @@ const community = [
       title: {
         en: 'Community',
         ru: 'Коммьюнити'
-      }
+      },
+      title_hide: true
     },
     children: [{
       path: ':category?',
       name: 'Blog',
+      meta: {
+        title: {
+          en: 'Community',
+          ru: 'Коммьюнити'
+        },
+        title_hide: true
+      },
       component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue')
     }]
   },{

package/src/modules/constructor/components/elements/Image.vue

@@ -1,7 +1,7 @@
 <template>
   <div 
     class="w-100 bg-white radius-big image-upload-area flex-v-center flex-h-center flex t-black mn-small">
-    <img v-if="prop.content" :src="prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
+    <img v-if="prop.content" :src="(FILE_SERVER_URL || '') + prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
   </div>
 </template>
 

package/src/modules/constructor/components/elements/ImageUpload.vue

@@ -4,7 +4,7 @@
     @drop="onDrop"
     @dragover.prevent
     class="w-100 radius-big bg-white image-upload-area flex-v-center flex-h-center flex t-black mn-small">
-    <img v-if="prop.content" :src="prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
+    <img v-if="prop.content" :src="(FILE_SERVER_URL || '') + prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
     <span v-else class="t-transp pd-extra" >Click or drag-and-drop your image</span>
     <input type="file" ref="fileInput" @change="onFileChange" style="display: none"/>
   </div>

package/src/modules/events/components/blocks/CardEvent.vue

@@ -18,21 +18,20 @@
 
     />
 
+
  		<div 
  			v-if="event.cover && type !== 'short'" 
  			class="o-hidden bg-grey mn-small w-100"
  		>
 	    <img 
-	    	
-	    	:src="event.cover" 
+	    	:src="(FILE_SERVER_URL || '') + event.cover" 
 	    	alt="Event image" 
 	    	class="z-index-1 d-block mn-auto h-20r"
 	    />
 
 	    <img 
-	    	
-	    	:src="event.cover" 
-	    	alt="Event image" 
+	    	:src="(FILE_SERVER_URL || '') + event.cover" 
+	    	alt="Event Background" 
 	    	class="z-index-0 pos-absolute w-100 h-100 pos-t-0 pos-r-0"
 	    	style="
 	    		transform: scale(1.5);
@@ -45,7 +44,18 @@
     	class="w-100"
     	:class="{'pd-t-zero pd-medium': type !== 'short'}"
     >
-    	
+
+	    <IconEdit
+				v-if="user === event.creator.target._id"
+				@click.stop="$router.push({
+					name: 'Edit Event', 
+					params: {
+						url: event.url
+					}
+				})" 
+				class="z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+			/>
+
     	<div
     		:class="{'mn-small': type !== 'short'}"
     		class="flex-v-center flex-nowrap flex"
@@ -118,6 +128,8 @@
 <script setup="props">
 	import Chips  from '@pf/src/components/Chips/Chips.vue'
 
+	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+
 	import CardHeader  from '@pf/src/components/CardHeader/CardHeader.vue'
 	import CardFooter  from '@pf/src/components/CardFooter/CardFooter.vue'
 

package/src/modules/events/components/elements/ButtonJoin.vue

@@ -1,7 +1,7 @@
 <template>
   <Button
     :submit="toggleJoin"
-    class="bg-main button-small button"
+    class="bg-main button-small radius-extra button"
   >
     {{ hasTicket ? 'Leave' : 'Join' }}
   </Button>

package/src/modules/events/router/events.js

@@ -8,11 +8,19 @@ const eventsRoutes = [
       title: {
         en: 'Events',
         ru: 'События'
-      }
+      },
+      title_hide: true
     },
     children: [{
       path: ':category?',
       name: 'Events',
+      meta: {
+        title: {
+          en: 'Events',
+          ru: 'События'
+        },
+        title_hide: true
+      },
       component: () => import(/* webpackChunkName: 'EventList' */ '../components/pages/Events.vue')
     }]
   },{

package/src/modules/landing/components/sections/MobileApp.vue

@@ -2,7 +2,7 @@
   <div id="mobileApp">
     <section class="cols-2-1_2 gap-big pd-big pd-t-big o-hidden bg-black t-white radius-big">
       <div class="z-index-1  w-1/2">
-        <img :src="mockupImage" alt="Mobile App Mockup" class="app-mockup">
+        <img :src="(FILE_SERVER_URL || '') + mockupImage" alt="Mobile App Mockup" class="app-mockup">
       </div>
 
       <div class="z-index-1 w-1/2">

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="flex-stretch flex-nojustify flex-nowrap flex shop-cart-item">
     <!-- Item Image -->
-    <img class="bg-grey aspect-1x1 " v-if="product.images[0]"    :src="product.images[0]">
+    <img class="bg-grey aspect-1x1 " v-if="product.images[0]"    :src="(FILE_SERVER_URL || '') + product.images[0]">
     <svg 
       width="524" 
       height="345" 

package/src/modules/orders/components/blocks/Positions.vue

@@ -23,8 +23,8 @@
 
     <ul  class="mn-semi">
       <li v-for="(product, index) in orderProducts" :key="product._id" class="shop-cart-item mn-small ">
-        <!-- <img v-if="product.images" :src="require( `@/assets/images/products/${product.images.links[0]}`)"> -->
-        <!-- <img v-if="!product.images" :src="require( `@/assets/icons/photo.svg`)"> -->
+        <!-- <img v-if="product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/images/products/${product.images.links[0]}`)"> -->
+        <!-- <img v-if="!product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/icons/photo.svg`)"> -->
         <div class="text-left">
           <p class="name">{{ product.name }}</p>
           

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -6,18 +6,18 @@
     <div class="pd-medium flex-v-center flex-nowrap flex">
       <img 
         v-if="organization.profile.photo && organization.profile.photo.length > 0"
-        :src="organization.profile.photo" 
-        class="h-4r w-4r radius-extra bg-main" 
+        :src="(FILE_SERVER_URL || '') + organization.profile.photo" 
+        class="h-4r w-4r radius-extra bg-white" 
       />
 
-      <svg  v-else class="h-4r w-4r radius-extra" width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <svg  v-else class=" h-4r w-4r radius-extra" width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
         <circle fill="rgb(var(--main))" cx="21" cy="21" r="21" />
         <path fill="#242424" fill-opacity="0.1" fill-rule="evenodd" clip-rule="evenodd" d="M8.00233 37.4954C8.00078 37.4458 8 37.3961 8 37.3462C8 32.9066 11.5673 29.3077 15.9677 29.3077H26.0323C30.4328 29.3077 34 32.9066 34 37.3462C34 37.3961 33.9992 37.4458 33.9977 37.4954C30.4223 40.3165 25.9078 42 21 42C16.0922 42 11.5777 40.3164 8.00233 37.4954ZM21 9C16.5995 9 13.0323 12.5989 13.0323 17.0385C13.0323 21.478 16.5995 25.0769 21 25.0769C25.4005 25.0769 28.9677 21.478 28.9677 17.0385C28.9677 12.5989 25.4005 9 21 9Z" />
       </svg>
       
-      <div class="mn-l-small">
+      <div class="flex-child-1 flex-child mn-l-small w-100">
         <p class="h3 mn-r-semi mn-thin">
-          <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="20" />
+          <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="16" />
         </p>
 
         <div v-if="organization.ratingS" class="w-max star-container flex-v-center flex">

package/src/modules/organizations/components/blocks/DepartmentSub.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pd-small flex-nowrap flex">
-    <!-- <img :src="avatar" :alt="`${name} avatar`" class="user-card__avatar" /> -->
+    <!-- <img :src="(FILE_SERVER_URL || '') + avatar" :alt="`${name} avatar`" class="user-card__avatar" /> -->
     <div class="user-card__info">
       <p class="user-card__name">{{ department.name ? department.name : 'Безымянный' }}</p>
       <p class="user-card__position">{{ department.members ? department.members.length : '0' }} человек</p>

package/src/modules/organizations/components/blocks/User.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pd-small flex-nowrap flex">
-    <!-- <img :src="avatar" :alt="`${name} avatar`" class="user-card__avatar" /> -->
+    <!-- <img :src="(FILE_SERVER_URL || '') + avatar" :alt="`${name} avatar`" class="user-card__avatar" /> -->
     <div class="user-card__info">
       <p class="user-card__name">{{ user.name ? user.name : 'Безымянный' }}</p>
       <p class="t-transp">{{ position }}</p>

package/src/modules/organizations/components/pages/Organization.vue

@@ -130,7 +130,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 	// Get organization _id from cookie
   	// Async requests

package/src/modules/organizations/components/pages/Organizations.vue

@@ -20,7 +20,7 @@
 	        class="mn-small radius-medium pd-medium br-2px br-solid br-grey"
 	        @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
 	      >	
-	        <img v-if="organization.profile.photo.length > 0" :src="organization.profile.photo" class="radius-medium mn-small i-thin" />
+	        <img v-if="organization.profile.photo.length > 0" :src="(FILE_SERVER_URL || '') + organization.profile.photo" class="radius-medium mn-small i-thin" />
 
 					<svg v-else class="radius-medium mn-small i-thin" width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
 						<circle fill="rgb(var(--main))" cx="21" cy="21" r="21" />
@@ -80,7 +80,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/organizations/components/pages/OrganizationsAccount.vue

@@ -21,7 +21,7 @@
 	        class="mn-small radius-medium pd-medium br-2px br-solid br-grey"
 	        @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
 	      >	
-	        <img v-if="organization.profile.photo.length > 0" :src="organization.profile.photo" class="radius-medium mn-small i-thin" />
+	        <img v-if="organization.profile.photo.length > 0" :src="(FILE_SERVER_URL || '') + organization.profile.photo" class="radius-medium mn-small i-thin" />
 
 	        <svg v-else class="radius-medium mn-small i-thin" width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
 						<circle fill="rgb(var(--main))" cx="21" cy="21" r="21" />
@@ -82,7 +82,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/organizations/components/sections/DetailsTab.vue

@@ -15,7 +15,7 @@
 
 			<img 
 				v-if="organization.profile.photo" 
-				:src="organization.profile.photo" 
+				:src="(FILE_SERVER_URL || '') + organization.profile.photo" 
 				class="radius-big bg-grey flex-center flex mn-small i-extra" 
 			/>
 

package/src/modules/organizations/components/sections/Organizations.vue

@@ -78,7 +78,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>
 

package/src/modules/organizations/components/sections/Publics.vue

@@ -15,7 +15,7 @@
 		      	:organization="organization"
 		      	:user="auth.state.user"
 				@updateMembership="handleMembershipUpdate"
-				class="flex-child-1 flex-child w-100"
+				class="flex-child-1 flex-child w-25r"
 		    />
 		</div>
 	</div>

package/src/modules/products/components/blocks/Images360.vue

@@ -10,7 +10,7 @@
 
     <transition name="scale5" :css="!firstImageLoad" appear>
       <div v-if="currentImage" class="h-100 w-100 transition-ease">
-        <img v-if="currentImage" :key="currentImage" class="h-100 w-100 transition-ease" :src="currentImage.src" alt="360 product view" @mousedown="startRotation" @mousemove="rotate" @mouseup="stopRotation" @mouseleave="stopRotation" @touchstart="startRotation" @touchmove="rotate" @touchend="stopRotation" @dragstart.prevent>
+        <img v-if="currentImage" :key="currentImage" class="h-100 w-100 transition-ease" :src="(FILE_SERVER_URL || '') + currentImage.src" alt="360 product view" @mousedown="startRotation" @mousemove="rotate" @mouseup="stopRotation" @mouseleave="stopRotation" @touchstart="startRotation" @touchmove="rotate" @touchend="stopRotation" @dragstart.prevent>
 
       </div>
     </transition>

package/src/modules/products/components/blocks/ImagesThumbnails.vue

@@ -4,7 +4,7 @@
       <img
         v-for="(image, index) in images"
         :key="index"
-        :src="image" 
+        :src="(FILE_SERVER_URL || '') + image" 
         @click="openPopup(index)"
         class="radius-medium bg-white o-hidden thumbnail"
       />

package/src/modules/products/components/blocks/LeftoverPositions.vue

@@ -31,8 +31,8 @@
       <span v-if="order.positions.length < 1" class="w-100">Вы еще не добавили позиции</span> 
 
       <li v-for="(product, index) in order.positions" :key="product._id" class="w-100">
-        <!-- <img v-if="product.images" :src="require( `@/assets/images/products/${product.images.links[0]}`)"> -->
-        <!-- <img v-if="!product.images" :src="require( `@/assets/icons/photo.svg`)"> -->
+        <!-- <img v-if="product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/images/products/${product.images.links[0]}`)"> -->
+        <!-- <img v-if="!product.images" :src="(FILE_SERVER_URL || '') + require( `@/assets/icons/photo.svg`)"> -->
         <div class="w-100 flex-center flex-nowrap flex">
           <span class="mn-r-regular w-100">{{ product.name }}</span>
           <input 

package/src/modules/products/components/blocks/ProductCard.vue

@@ -24,7 +24,7 @@
 			"
 		>
 			<!-- Image Wrappers  -->
-			<img v-if="product.images[0]" :src="product.images[0]" class="w-100 h-100">
+			<img v-if="product.images[0]" :src="(FILE_SERVER_URL || '') + product.images[0]" class="w-100 h-100">
 			<svg 
 				v-else
 				class="h-100 w-100"

package/src/modules/products/components/sections/EditProductImages.vue

@@ -6,7 +6,7 @@
 
 	 <VueDraggableNext class="cols-4 dragArea list-group w-full" :list="product.images"  :sort="true" @change="log">
 			<div v-for="(image, index) in product.images" class="flex-column block">
-				<img class="w-100 mn-small" :src="image" />
+				<img class="w-100 mn-small" :src="(FILE_SERVER_URL || '') + image" />
 				<a @click="deleteImage(index)" class="w-100 br-grey br-solid br-1px button">Удалить</a>
 			</div>
 		</VueDraggableNext>

package/src/modules/products/components/sections/HeroRecommendation.vue

@@ -130,7 +130,7 @@
 						"
 					>
 						<img 
-							:src="'/icons/moods/' + preset + '.png'" 
+							:src="(FILE_SERVER_URL || '') + '/icons/moods/' + preset + '.png'" 
 							class="h-8r w-8r mn-thin"
 						/>
 

package/src/modules/products/components/sections/SectionProduct.vue

@@ -13,7 +13,7 @@
 					v-if="images[0] && !product.image3d"
 					class="h-100 w-100"
 					style="object-fit: cover;"
-					:src="images[0]"
+					:src="(FILE_SERVER_URL || '') + images[0]"
 				/>
 				<svg 
 					width="524" 

package/src/modules/users/components/pages/Profile.vue

@@ -29,8 +29,8 @@
 
 				<img 
 					v-if="users.state.current.profile.photo.length > 0" 
-					:src="users.state.current.profile.photo" 
-					class="radius-medium mn-small i-extra" 
+					:src="(FILE_SERVER_URL || '')+ users.state.current.profile.photo" 
+					class="radius-extra bg-white mn-small i-extra" 
 				/>
 				
 				<PlaceholderUserpic 
@@ -39,7 +39,7 @@
 				/>
 
 				<h3 
-					class=""
+					class="mn-thin"
 				>
 					{{users.state.current.profile.name ? users.state.current.profile.name : 'Не указан' }}
 				</h3>

package/src/modules/users/components/pages/ProfileBlogposts.vue

@@ -63,6 +63,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileComments.vue

@@ -38,6 +38,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileEdit.vue

@@ -27,7 +27,7 @@
        <UploadImage 
           v-model:photo="user.profile.photo"
           :uploadPath="'users/' + user._id + '/avatars'"
-          class="h-4r w-4r aspect-1x1 o-hidden mn-thin radius-extra" 
+          class="h-4r w-4r aspect-1x1 o-hidden bg-white mn-thin radius-extra" 
         />
         <h4>Upload userpic</h4>
     </div>

package/src/modules/users/components/pages/ProfileEvents.vue

@@ -64,6 +64,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileLikes.vue

@@ -38,6 +38,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

package/src/modules/users/components/pages/ProfileOrganizations.vue

@@ -58,6 +58,6 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.push({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
 </script>

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

@@ -34,18 +34,21 @@ const users = [{
 },{
   path: 'profile/:_id/edit',
   name: 'User Edit Profile',
-   meta: {
-      title: {
-        en: 'Edit Profile',
-        ru: 'Редактировать Профиль'
-      }
-    },
+  meta: {
+    title: {
+      en: 'Edit Profile',
+      ru: 'Редактировать Профиль'
+    }
+  },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
 },{
   path: 'profile/:_id/events',
   name: 'User Events',
   meta: {
-    title: 'Профиль',
+    title: {
+      en: 'Events',
+      ru: 'События'
+    }
   },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEvents.vue'),
 },{

package/src/styles/base/all.scss

@@ -283,6 +283,7 @@ body {
 	// REM
 	.w-50r 	{ width: 50rem; }
 	.w-30r 	{ width: 30rem; }
+	.w-25r 	{ width: 25rem; }
 	.w-20r 	{ width: 20rem; }
 	.w-15r 	{ width: 15rem; }
 	.w-10r 	{ width: 10rem; }