@ozdao/prometheus-framework 0.2.51 → 0.2.53

package/src/components/LocationMarker/LocationMarker.vue

@@ -47,6 +47,7 @@ let map, marker;
 
 onMounted(() => {
   console.log(props.location)
+  
   map = new google.maps.Map(mapContainer.value, {
     center: props.location,
     zoom: 15,

package/src/modules/applications/applications.client.js

@@ -1,2 +1 @@
-
 import SubscribeNewsletter from './components/sections/SubscribeNewsletter.vue';

package/src/modules/globals/components/blocks/BlockSearch.vue

@@ -0,0 +1,42 @@
+<script setup>
+import { ref } from 'vue';
+
+import IconSearch from '@pf/src/modules/icons/navigation/IconSearch.vue';
+import Field from '@pf/src/components/Field/Field.vue';
+
+const emits = defineEmits(['search']);
+const props = defineProps({
+  placeholder: {
+    type: String,
+    default: 'Enter shop or product name'
+  },
+  button: {
+    type: String,
+    default: 'Search'
+  },
+});
+
+const stateSearch = ref(null)
+
+const updateSearch = (search) => {
+  emits('search', search);
+};
+</script>
+
+<template>
+  <div class="flex-v-center flex-nowrap flex pd-small bg-grey w-100 radius-big">
+    <IconSearch class="i-medium t-transp mn-r-thin" />
+    <Field
+      :placeholder="placeholder"
+      @update:field="search => stateSearch = search"
+      class="w-100"
+    />
+
+    <button 
+      class="pd-r-small pd-l-small pd-t-thin pd-b-thin p-medium uppercase p-small t-medium cursor-pointer radius-extra bg-main" 
+      @click="updateSearch(stateSearch)"
+    >
+      {{ button }}
+    </button>
+  </div>
+</template>

package/src/modules/icons/entities/IconProfile.vue

@@ -1,5 +1,14 @@
 <template>
 	<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-		<path d="M13.875 14.375H10.125C6.33594 14.375 3.25 17.4609 3.25 21.25C3.25 21.9531 3.79688 22.5 4.5 22.5H19.5C20.2031 22.5 20.75 21.9531 20.75 21.25C20.75 17.4609 17.6641 14.375 13.875 14.375ZM5.16406 20.625C5.47656 18.1641 7.58594 16.25 10.125 16.25H13.875C16.4141 16.25 18.5234 18.1641 18.8359 20.625H5.16406ZM12 12.5C14.7734 12.5 17 10.2734 17 7.5C17 4.72656 14.7734 2.5 12 2.5C9.22656 2.5 7 4.72656 7 7.5C7 10.2734 9.22656 12.5 12 12.5ZM12 4.375C13.7188 4.375 15.125 5.78125 15.125 7.5C15.125 9.21875 13.7188 10.625 12 10.625C10.2812 10.625 8.875 9.21875 8.875 7.5C8.875 5.78125 10.2812 4.375 12 4.375Z" fill="rgb(var(--black))"/>
+		<path :fill="fill" :class="$attrs.class" d="M13.875 14.375H10.125C6.33594 14.375 3.25 17.4609 3.25 21.25C3.25 21.9531 3.79688 22.5 4.5 22.5H19.5C20.2031 22.5 20.75 21.9531 20.75 21.25C20.75 17.4609 17.6641 14.375 13.875 14.375ZM5.16406 20.625C5.47656 18.1641 7.58594 16.25 10.125 16.25H13.875C16.4141 16.25 18.5234 18.1641 18.8359 20.625H5.16406ZM12 12.5C14.7734 12.5 17 10.2734 17 7.5C17 4.72656 14.7734 2.5 12 2.5C9.22656 2.5 7 4.72656 7 7.5C7 10.2734 9.22656 12.5 12 12.5ZM12 4.375C13.7188 4.375 15.125 5.78125 15.125 7.5C15.125 9.21875 13.7188 10.625 12 10.625C10.2812 10.625 8.875 9.21875 8.875 7.5C8.875 5.78125 10.2812 4.375 12 4.375Z"/>
 	</svg>
 </template>
+
+<script setup>
+	const props = defineProps({
+	  fill: {
+	    type: String,
+	    default: 'rgb(var(--black))'
+	  }
+	})
+</script>

package/src/modules/icons/entities/IconShopcart.vue

@@ -1,5 +1,15 @@
 <template>
 	<svg width="49" height="49" viewBox="0 0 49 49" fill="none" xmlns="http://www.w3.org/2000/svg">
-	<path d="M43.6479 32.1117C44.7969 31.1767 45.5809 29.8596 45.8562 28.404L48.8334 12.6366L13.0939 9.60262L12.5743 5.71378C12.3618 4.12526 11.5726 2.67323 10.3521 1.62504C9.131 0.577364 7.55684 0 5.91995 0H0.127808V3.05678H5.91943C7.7435 3.05678 9.23937 4.34089 9.47632 6.11052L13.2038 34.0001C13.4164 35.5886 14.2055 37.0411 15.4256 38.0898C16.6461 39.139 18.2203 39.7169 19.8577 39.7169H44.7404V36.6601H19.8577C18.0336 36.6601 16.5377 35.3745 16.3008 33.6038L16.2951 33.5622H39.5181C41.0326 33.5617 42.4989 33.0468 43.6479 32.1117ZM13.5087 12.7061L45.1365 15.391L42.7841 27.8484C42.4886 29.4126 41.1462 30.5049 39.5191 30.5049H15.887L13.5087 12.7061ZM22.166 40.4556C19.8416 40.4556 17.9506 42.3059 17.9506 44.5809C17.9506 46.8553 19.8416 48.7056 22.166 48.7056C24.4905 48.7056 26.3819 46.8553 26.3819 44.5809C26.3814 42.3059 24.4905 40.4556 22.166 40.4556ZM22.166 45.6488C21.5641 45.6488 21.0741 45.1694 21.0741 44.5803C21.0741 43.9913 21.5641 43.5119 22.166 43.5119C22.768 43.5119 23.258 43.9913 23.258 44.5803C23.2575 45.1699 22.768 45.6488 22.166 45.6488ZM37.3243 40.4556C34.9999 40.4556 33.1084 42.3059 33.1084 44.5809C33.1084 46.8553 34.9994 48.7056 37.3243 48.7056C39.6503 48.7056 41.5428 46.8553 41.5428 44.5809C41.5428 42.3059 39.6508 40.4556 37.3243 40.4556ZM37.3243 45.6488C36.7223 45.6488 36.2324 45.1694 36.2324 44.5803C36.2324 43.9913 36.7223 43.5119 37.3243 43.5119C37.9279 43.5119 38.4189 43.9913 38.4189 44.5803C38.4189 45.1699 37.9279 45.6488 37.3243 45.6488Z" fill="rgb(var(--black))"/>
+		<path :fill="fill" :class="$attrs.class" d="M43.6479 32.1117C44.7969 31.1767 45.5809 29.8596 45.8562 28.404L48.8334 12.6366L13.0939 9.60262L12.5743 5.71378C12.3618 4.12526 11.5726 2.67323 10.3521 1.62504C9.131 0.577364 7.55684 0 5.91995 0H0.127808V3.05678H5.91943C7.7435 3.05678 9.23937 4.34089 9.47632 6.11052L13.2038 34.0001C13.4164 35.5886 14.2055 37.0411 15.4256 38.0898C16.6461 39.139 18.2203 39.7169 19.8577 39.7169H44.7404V36.6601H19.8577C18.0336 36.6601 16.5377 35.3745 16.3008 33.6038L16.2951 33.5622H39.5181C41.0326 33.5617 42.4989 33.0468 43.6479 32.1117ZM13.5087 12.7061L45.1365 15.391L42.7841 27.8484C42.4886 29.4126 41.1462 30.5049 39.5191 30.5049H15.887L13.5087 12.7061ZM22.166 40.4556C19.8416 40.4556 17.9506 42.3059 17.9506 44.5809C17.9506 46.8553 19.8416 48.7056 22.166 48.7056C24.4905 48.7056 26.3819 46.8553 26.3819 44.5809C26.3814 42.3059 24.4905 40.4556 22.166 40.4556ZM22.166 45.6488C21.5641 45.6488 21.0741 45.1694 21.0741 44.5803C21.0741 43.9913 21.5641 43.5119 22.166 43.5119C22.768 43.5119 23.258 43.9913 23.258 44.5803C23.2575 45.1699 22.768 45.6488 22.166 45.6488ZM37.3243 40.4556C34.9999 40.4556 33.1084 42.3059 33.1084 44.5809C33.1084 46.8553 34.9994 48.7056 37.3243 48.7056C39.6503 48.7056 41.5428 46.8553 41.5428 44.5809C41.5428 42.3059 39.6508 40.4556 37.3243 40.4556ZM37.3243 45.6488C36.7223 45.6488 36.2324 45.1694 36.2324 44.5803C36.2324 43.9913 36.7223 43.5119 37.3243 43.5119C37.9279 43.5119 38.4189 43.9913 38.4189 44.5803C38.4189 45.1699 37.9279 45.6488 37.3243 45.6488Z"/>
 </svg>
-</template>
+</template>
+
+
+<script setup>
+	const props = defineProps({
+	  fill: {
+	    type: String,
+	    default: 'rgb(var(--black))'
+	  }
+	})
+</script>

package/src/modules/marketplace/components/layouts/Marketplace.vue

@@ -20,17 +20,9 @@
 			class="mn-b-thin"
 		/>
 
-		<div class="flex-v-center flex-nowrap flex pd-small bg-grey w-100 radius-big">
-			<IconSearch 
-				class="i-medium mn-r-thin" 
-			/>
-			<Field
-				placeholder="Enter shop or product name"
-				@update:field="search => store.globals.state.search = search"
-				class="w-100"
-			/>
-			<button class="pd-thin uppercase p-small t-medium cursor-pointer radius-extra bg-main" @click="updateSearchQuery">Search</button>
-		</div>
+		<BlockSearch 
+			@search="updateSearch"
+		/>
 		
 		<!-- Catalog wrapper -->
 		<div class="cols-1 gap-thin pd-thin">
@@ -53,6 +45,8 @@
 	import { useI18n } from 'vue-i18n'
   import { useMeta } from 'vue-meta'
 	// Import components
+	import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+
 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
 	import IconSearch from '@pf/src/modules/icons/navigation/IconSearch.vue'
 	import Field from '@pf/src/components/Field/Field.vue'
@@ -81,11 +75,10 @@
 	    .replace(/[^a-z0-9-]/g, '');
 	}
 
-
-	function updateSearchQuery() {
+	function updateSearch(search) {
 		let query = { ...route.query}
 		
-		query.search = store.globals.state.search
+		query.search = search
 	  
 	  router.push({ query });
 	}

package/src/modules/marketplace/components/sections/Filters.vue

@@ -185,7 +185,13 @@
 	const { t } = useI18n(text)
 
 	onMounted(async () => {
-		await store.categories.actions.fetchCategories()
+    let options = {
+      status: 'published'
+    }
+
+    console.log(options)
+    console.log()
+		await store.categories.actions.fetchCategories(options)
 
 		store.categories.state.all.forEach( category => {
 	  	category.localization.forEach( localization => {

package/src/modules/mobile/components/NavigationBar/NavigationBar.vue

@@ -3,17 +3,26 @@
 		class="pos-sticky w-100 z-index-4 br-b br-solid br-black-transp flex-center flex t-center pd-medium bg-white"
 	>
 
+		<Button
+			v-if="route.meta.title_hide"
+			:submit="a => store.shopcart.actions.toggleShopcart()" 
+			:counter="store.shopcart.getters.cartTotalAmount" 
+			:showSucces="false"
+			:showLoader="false"
+			class="header-shopcart pd-zero mn-l-auto"
+			> 
+			<IconShopcart class="i-semi" fill="#00ff88" />
+		</Button>
+
+
 		<transition name="slideIn"  mode="out-in">
 
-			<svg 
+			<IconProfile 
 				v-if="route.meta.title_hide"
 				@click="handleToggle()" 
-				class="header-profile" width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg"
-			>
-				<path fill="rgb(var(--main))" d="M13.0005 1.3116e-05C10.3952 -0.0036893 7.84916 0.776533 5.6933 2.23923C3.53744 3.70193 1.87154 5.77943 0.912205 8.20159C-0.0471263 10.6238 -0.255503 13.2785 0.31417 15.8207C0.883843 18.3629 2.20521 20.6749 4.10645 22.456C4.16716 22.5296 4.23824 22.5939 4.31745 22.647C6.69461 24.8048 9.79003 26.0001 13.0005 26.0001C16.2109 26.0001 19.3063 24.8048 21.6835 22.647C21.7624 22.5939 21.8331 22.5295 21.8935 22.456C23.7946 20.6749 25.116 18.363 25.6857 15.821C26.2554 13.2789 26.0471 10.6242 25.0879 8.20206C24.1287 5.77994 22.4629 3.70243 20.3072 2.23965C18.1515 0.77688 15.6056 -0.0034882 13.0005 1.3116e-05ZM5.96345 21.445C6.30727 20.174 7.05858 19.0509 8.10211 18.248C9.14565 17.445 10.4238 17.0066 11.7405 17H14.2605C15.5774 17.006 16.856 17.444 17.8999 18.2468C18.9439 19.0496 19.6955 20.1728 20.0395 21.444C18.0658 23.095 15.5746 23.9996 13.0015 23.9996C10.4283 23.9996 7.93709 23.096 5.96345 21.445ZM21.6005 19.837C20.9791 18.4049 19.9541 17.1848 18.6506 16.3258C17.3471 15.4668 15.8215 15.0061 14.2605 15H11.7405C10.1789 15.0059 8.65303 15.4669 7.34941 16.3265C6.04579 17.1861 5.02101 18.4071 4.40045 19.84C3.10942 18.2212 2.30151 16.2708 2.06964 14.2132C1.83777 12.1556 2.19136 10.0744 3.08975 8.20883C3.98813 6.34326 5.39482 4.76915 7.14805 3.66751C8.90128 2.56587 10.9298 1.98144 13.0005 1.98144C15.0711 1.98144 17.0996 2.56587 18.8529 3.66751C20.6061 4.76915 22.0128 6.34326 22.9112 8.20883C23.8095 10.0744 24.1631 12.1556 23.9313 14.2132C23.6994 16.2708 22.8915 18.2212 21.6005 19.84V19.837Z"/>
-				<path fill="rgb(var(--main))" d="M13.0005 4C12.0116 4 11.0449 4.29324 10.2226 4.84265C9.40039 5.39206 8.75953 6.17295 8.38109 7.08658C8.00265 8.00021 7.90364 9.00555 8.09656 9.97545C8.28949 10.9454 8.76569 11.8363 9.46496 12.5355C10.1642 13.2348 11.0551 13.711 12.025 13.9039C12.9949 14.0969 14.0003 13.9978 14.9139 13.6194C15.8275 13.241 16.6084 12.6001 17.1578 11.7779C17.7072 10.9556 18.0005 9.98891 18.0005 9C17.9989 7.67441 17.4716 6.40356 16.5343 5.46622C15.5969 4.52888 14.3261 4.00159 13.0005 4ZM13.0005 12C12.4071 12 11.8271 11.8241 11.3338 11.4944C10.8404 11.1648 10.4559 10.6962 10.2289 10.1481C10.0018 9.59987 9.94238 8.99667 10.0581 8.41473C10.1739 7.83279 10.4596 7.29824 10.8792 6.87868C11.2987 6.45912 11.8333 6.1734 12.4152 6.05764C12.9972 5.94189 13.6004 6.0013 14.1485 6.22836C14.6967 6.45542 15.1653 6.83994 15.4949 7.33329C15.8245 7.82664 16.0005 8.40666 16.0005 9C16.0005 9.79565 15.6844 10.5587 15.1218 11.1213C14.5592 11.6839 13.7961 12 13.0005 12Z"/>
-			</svg>
-
+				class="header-profile i-semi"
+				fill="#00ff88" 
+			/>
 
 			<svg 
 				v-else 
@@ -47,6 +56,11 @@
 	import { useI18n } from 'vue-i18n';
 	import { useStore } from '@/store';
 	
+  import IconShopcart from '@pf/src/modules/icons/entities/IconShopcart.vue'
+	import IconProfile from '@pf/src/modules/icons/entities/IconProfile.vue'
+
+	import Button 				from '@pf/src/components/Button/Button.vue'
+
 
 	const router = useRouter()
 	const route = useRoute()
@@ -100,6 +114,12 @@
 		height: 2rem;
 	}
 
+	.header-shopcart {
+		position: absolute;
+		right: 4.25rem;
+		height: 2rem;
+	}
+
 	.header-title {
 		pointer-events: none;
 	}

package/src/modules/orders/components/partials/ShopCart.vue

@@ -8,7 +8,7 @@
         <h4 class="mn-b-thin p-big">{{t('title')}}</h4>
         <p class="t-transp p-small">{{t('subtitle')}} {{ t('positions', { count: StoreCartAmount }) }}</p>
       </div>
-      <button @click="shopcart.actions.toggleShopcart" class="button-icon"><img src="@/assets/icons/cross.svg"></button>
+      <IconCross @click="shopcart.actions.toggleShopcart" class="button-icon"/>
     </div>
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Popup Content  -->
@@ -57,6 +57,9 @@
   // Components
   import CardOrderItem from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue';
 
+  import IconCross from '@pf/src/modules/icons/navigation/IconCross.vue';
+
+
   import * as shopcart from '@pf/src/modules/orders/store/shopcart';
   /////////////////////////////
   // CREATED

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

@@ -1,77 +1,45 @@
 <template>
   <div class="radius-big o-hidden cols-2-1_3">
-    <!-- <Map :location="{lat: department.location.coordinates[1] ,lng: department.location.coordinates[0]}" class=""/> -->
 
     <div class="pd-medium w-100">
-     <svg  @click="$router.push(`/organizations/${props.organization}/departments/${department._id}/edit`)" class="i-regular pos-absolute pos-r-0 pos-t-0 t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="rgb(var(--black))"/>
-      </svg>
-      
+
+      <router-link 
+        :to="{
+          name: 'Department Edit', 
+          params: {
+            _id: props.organization,
+            department: department._id
+          }
+        }" 
+        class="
+          cursor-pointer 
+          pos-absolute pos-t-regular pos-r-regular
+          radius-extra pd-thin bg-second
+        "
+      >
+        <IconEdit
+          class="i-regular"
+          classes="fill-white"
+        />
+      </router-link>
+
       <h3 
         @click="$router.push(`/organizations/${props.organization}/departments/${department._id}`)"
         class="mn-b-small w-100"
         v-html="department.profile.name"
       />
     
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Contacts </h5>
-            <p class="mn-r-small">{{department.members.length}}&nbsp;человек</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-           <ul>
-            <li v-if="department.members.length < 1">В отделе еще нет участников</li>
-            <User 
-              class="br-b br-solid br-grey" 
-              v-for="(member, index) in department.members" 
-              :key="index" 
-              :user="member.user" 
-              :position="member.position" 
-              @click="$router.push(`/app/profile/${member.user._id}`)" 
-            />
-          </ul>
-        </template>
-      </Spoiler>
-
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Working Hours </h5>
-            <p class="mn-r-small">{{department.subdepartments ? department.subdepartments.length : 0}}&nbsp;отделов</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-          <ul>
-            <li v-if="department.subdepartments.length < 1">В отделе еще нет подотделов</li>
-            <DepartmentSub  v-for="(subdepartmentsartment, index) in department.subdepartments" @click="$router.push(`/organization/departments/${subdepartmentsartment._id}`)" :key="index" class="br-b br-solid br-grey" :department="subdepartmentsartment" />
-          </ul>
-        </template>
-      </Spoiler>
-
+      <ul>
+        <li v-if="department.members.length < 1">В отделе еще нет участников</li>
+        <User 
+          class="br-b br-solid br-grey" 
+          v-for="(member, index) in department.members" 
+          :key="index" 
+          :user="member.user" 
+          :position="member.position" 
+          @click="$router.push(`/app/profile/${member.user._id}`)" 
+        />
+      </ul>
     </div>
   </div>
 </template>
@@ -79,9 +47,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
-import Map      from '@pf/src/components/Map/Map.vue';
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
+import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
 import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 

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

@@ -2,10 +2,43 @@
   <div>
 
     <div class="br-grey radius-small mn-small">
-      {{memberForm.id}}
+      <h3 class="mn-b-semi">Add to deparment</h3>
+
+      <div class="bg-grey mn-b-thin h-min-10r h-max-10r o-scroll pd-medium radius-big">
+        <Feed
+          :states="{
+            empty: {
+              title: 'No Members Found',
+              description: 'Currently, there are no members available.'
+            }
+          }"
+          :store="{
+            read: (options) => memberships.actions.read(options),
+            state: null
+          }"
+          :options="{
+            target: $route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+        >
+          <User 
+            v-for="(item, index) in items" 
+            :key="index" 
+            :photo="item.user.profile.photo"
+            :name="item.user.profile.name || item.user.phone || item.user.email || item.user._id"
+            :user="item" 
+            :position="item.position" 
+            @click="$router.push(`/app/profile/${user._id}`)" 
+            class="mn-b-thin" 
+          />
+        </Feed>
+      </div>
+
       <SelectMulti
         v-if="props.member === null"
-        v-model="memberForm.user"
+        v-model="userInput"
         :options="users"
         :multiple="false"
         :taggable="false"
@@ -13,11 +46,11 @@
         class="mn-b-semi bg-grey pd-medium radius-small" 
       />
 
-      <div v-else class="pd-small br-grey br-1px br-solid">
+    <!--   <div v-else class="pd-small br-grey br-1px br-solid">
         {{ memberForm.user.name ? memberForm.user.name : 'Безымянный' }}, {{memberForm.user.id}}
-      </div>
+      </div> -->
       <Field 
-        v-model:field="memberForm.position"  
+        v-model:field="roleInput"  
         label="Должность"  
         placeholder="Название должности" 
         class="bg-white "
@@ -25,7 +58,7 @@
       />
     </div>
 
-    <button :disabled="!memberForm.user._id || !memberForm.position" @click="submitForm" class="w-100 button bg-blue t-white">
+    <button :disabled="!userInput || !roleInput" @click="submitForm" class="w-100 button bg-blue t-white">
       {{ props.member !== null ? "Редактировать участника" : "Добавить участника" }}
     </button>
 
@@ -42,6 +75,11 @@ import SelectMulti    from '@pf/src/components/SelectMulti/SelectMulti.vue'
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
 
+import Feed from '@pf/src/components/Feed/Feed.vue'
+import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+
+import * as memberships   from '@pf/src/modules/organizations/store/memberships'
+
 const props = defineProps({
   isPopupOpen: Boolean,
   member: Number,
@@ -51,13 +89,11 @@ const props = defineProps({
 
 const emits = defineEmits(['callback','remove'])
 
-const memberForm = ref({
-  user: "",
-  position: "",
-});
+const userInput = ref(null);
+const roleInput = ref(null);
 
 if (props.member !== null) {
-  memberForm.value = props.members[props.member]
+  userInput.value = props.members[props.member]
 }
 
 import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
@@ -66,10 +102,11 @@ const placeValidation = ref(null)
 
 async function submitForm() {
    if (props.member !== null) {
-    props.members[props.member] = memberForm.value
+    props.members[props.member] = userInput
+    props.members[props.member].role = roleInput.value
     emits("callback");
   } else {
-    props.members.push(memberForm.value);
+    props.members.push({...userInput.value, role: roleInput.value});
     emits("callback");
   }
 }

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

@@ -1,8 +1,8 @@
 <template>
-  <div class="">
+  <div class="flex-v-center flex-nowrap flex">
     <img 
-      v-if="user.profile?.photo.length > 0 && type !== 'short'" 
-      :src="(FILE_SERVER_URL || '') + member.profile.photo" 
+      v-if="photo" 
+      :src="(FILE_SERVER_URL || '') + photo" 
       class="radius-medium object-fit-cover mn-r-thin i-thin" 
 
       @click.stop="$router.push({
@@ -12,9 +12,9 @@
         }
       })" 
     />
-    {{user}}123
+    <!-- <pre>{{user}}</pre> -->
     <PlaceholderUserpic
-      v-if="!user.profile?.photo && type !== 'short'"
+      v-if="!photo"
       class="radius-medium mn-r-thin i-thin"
 
       @click.stop="$router.push({
@@ -24,10 +24,11 @@
         }
       })" 
     />
-    <!-- <div class="user-card__info"> -->
-      <!-- <p class="user-card__name">{{ user.profile?.name || 'Безымянный' }}</p> -->
+
+    <p>{{ name }}</p>
+      
    <!-- </div> -->
-      <div class="mn-r-auto">
+      <!-- <div class="mn-r-auto">
         <span class=" mn-r-small">{{user.profile?.email}} {{user.profile?.phone}}</span>
         <span class="t-transp">{{user.role}}</span>
         <br>
@@ -36,7 +37,7 @@
 
       <div v-if="user.position !== 'Основатель'" class="mn-l-medium flex-v-center flex">
         <button @click="removeMember(user)" class="button-small button">×</button>
-      </div>
+      </div> -->
  
   </div>
 </template>
@@ -50,6 +51,14 @@
     user: {
       type: Object,
       required: true
+    },
+    photo: {
+      type: String,
+      default: null
+    },
+    name: {
+      type: String,
+      default: 'Anonymous'
     }
     // Define other props here
   });

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

@@ -7,9 +7,25 @@
 
           <h2 class="w-100">{{ departments.state.department.profile.name }}</h2>
 
-          <svg @click="$router.push(`/organizations/${route.params._id}/departments/${route.params.department}/edit`)"  class="i-regular t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-           <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="rgb(var(--black))"/>
-          </svg>
+          <router-link 
+            :to="{
+              name: 'Department Edit', 
+              params: {
+                _id: route.params._id,
+                department: route.params.department
+              }
+            }" 
+            class="
+              cursor-pointer 
+              pos-absolute pos-t-regular pos-r-regular
+              radius-extra pd-thin bg-second
+            "
+          >
+            <IconEdit
+              class="i-regular"
+              classes="fill-white"
+            />
+          </router-link>
 
         </div>
         <p class="t-transp p-big" v-html="departments.state.department.description"></p>

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

@@ -10,11 +10,15 @@
       </section>
 
     </header>
-
-    <div class="mn-b-thin bg-grey pd-medium o-hidden radius-big">
-      <h3 class="mn-b-semi">Profile</h3>
-      
-      <div v-if="departments.state.department.profile" class="radius-small flex-nowrap flex">
+    
+    <Block
+      title="Profile"
+      v-if="departments.state.department.profile"
+      class="mn-b-thin"
+    >
+      <div
+        class="cols-2-fit-content"
+      >
         <UploadImage 
            v-model:photo="departments.state.department.profile.photo"
           :uploadPath="'organizations/' + departments.state.department.name + '/avatars'"
@@ -37,7 +41,7 @@
           />  
         </div>
       </div>
-    </div>
+    </Block>
 
     <Block
       title="Team"
@@ -48,11 +52,14 @@
       }]"
       class="cols-1 gap-thin mn-b-thin"
     > 
+      <!-- {{departments.state.department.members[0]}} -->
       <User 
         class="bg-grey o-hidden radius-small mn-b-thin" 
         v-for="(member, index) in departments.state.department.members" 
         :key="index" 
         :user="member.user" 
+        :photo="member.user.profile.photo"
+        :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
         :position="member.position" 
         @click="openMemberPopup(index)"
       />
@@ -62,6 +69,7 @@
       title="Добавить участника" 
       @close-popup="closeMemberPopup" 
       :isPopupOpen="isOpenAddMemberPopup"
+      class="bg-white w-max-30r radius-big pd-big"
     >
       <DepartmentMemberModify 
         :members="departments.state.department.members" 
@@ -212,12 +220,8 @@ import User from '@pf/src/modules/organizations/components/blocks/User.vue';
 import * as departments from "@pf/src/modules/organizations/store/departments";
 import * as memberships from "@pf/src/modules/organizations/store/memberships";
 
-
-
 const router = useRouter();
 const route = useRoute();
-const tabOrganization = ref("details");
-const showAddNew = ref(false);
 
 async function fetchData() {
   if (route.params.department) {