@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/src/modules/orders/store/shopcart.js

@@ -11,7 +11,8 @@ import { setError }   from '@pf/src/modules/globals/store/globals'
 // State
 /////////////////////////////
 const state = reactive({
-  items: [],
+  organization: null,
+  positions: [],
   currentState: false
 });
 
@@ -26,22 +27,22 @@ const actions = {
 
   setShopcart() {
     try {
-      if (localStorage.getItem('shopcart')) state.items = JSON.parse(localStorage.getItem('shopcart'))
+      if (localStorage.getItem('shopcart')) state.positions = JSON.parse(localStorage.getItem('shopcart'))
     } catch (error) {
       console.error(error);
       throw error;
     }
   },
 
-  addProductToCart(product) {
-    const cartItem = state.items.find(
+  addProductToCart(product, organization) {
+    const cartItem = state.positions.find(
       (item) => item._id === product._id
     );
 
     if (cartItem) {
       cartItem.quantity++;
     } else {
-      state.items.push({
+      state.positions.push({
         _id: product._id,
         images: product.images,
         name: product.name,
@@ -50,53 +51,53 @@ const actions = {
       });
     }
 
-    localStorage.setItem('shopcart', JSON.stringify(state.items));
+    localStorage.setItem('shopcart', JSON.stringify(state.positions));
   },
 
   removeProduct(_id) {
-    const cartItem = state.items.find(
+    const cartItem = state.positions.find(
       (item) => item._id === _id
     );
-    const cartItemIndex = state.items.indexOf(cartItem);
+    const cartItemIndex = state.positions.indexOf(cartItem);
 
     if (cartItemIndex > -1) {
-      state.items.splice(cartItemIndex, 1);
+      state.positions.splice(cartItemIndex, 1);
 
-      localStorage.setItem('shopcart', JSON.stringify(state.items));
+      localStorage.setItem('shopcart', JSON.stringify(state.positions));
     }
   },
 
   decrementItemQuantity(_id) {
-    const cartItem = state.items.find(
+    const cartItem = state.positions.find(
       (item) => item._id === _id
     );
-    const cartItemIndex = state.items.indexOf(cartItem);
+    const cartItemIndex = state.positions.indexOf(cartItem);
     
     if (cartItemIndex > -1) {
       cartItem.quantity--;
       
       if (cartItem.quantity < 1) {
-        state.items.splice(cartItemIndex, 1);
+        state.positions.splice(cartItemIndex, 1);
       }
 
-      localStorage.setItem('shopcart', JSON.stringify(state.items));
+      localStorage.setItem('shopcart', JSON.stringify(state.positions));
     }
   },
 
   incrementItemQuantity(_id) {
-    const cartItem = state.items.find(
+    const cartItem = state.positions.find(
       (item) => item._id === _id
     );
 
     if (cartItem) {
       cartItem.quantity++;
 
-      localStorage.setItem('shopcart', JSON.stringify(state.items));
+      localStorage.setItem('shopcart', JSON.stringify(state.positions));
     }
   },
 
   resetShopcart({ state }) {
-    state.items = [];
+    state.positions = [];
     
     localStorage.removeItem('shopcart');
   },
@@ -107,13 +108,13 @@ const actions = {
 /////////////////////////////
 const getters = {
   cartTotalPrice: computed(() => {
-    return Number(state.items.reduce((total, product) => {
+    return Number(state.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
     }, 0));
   }),
 
   cartTotalAmount: computed(() => {
-    return Number(state.items.reduce((total, product) => {
+    return Number(state.positions.reduce((total, product) => {
       return total + product.quantity;
     }, 0));
   }),

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

@@ -4,7 +4,7 @@
 
     <div class="pd-medium w-100">
      <svg  @click="$router.push(`/app/organization/${props.organization._id}/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="black"/>
+        <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>
       
       <h3 

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

@@ -1,30 +1,27 @@
 <template>
   <div 
-    class="bg-grey radius-big o-hidden"
+    class="o-hidden pos-relative cursor-pointer bg-grey pd-small"
     @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
   >
-    <div class="w-max pd-medium flex-v-center flex-nowrap flex">
+    <div class="flex pos-relative">
+
       <img 
         v-if="organization.profile.photo && organization.profile.photo.length > 0"
         :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">
-        <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>
+      <PlaceholderOrganizationPic
+        v-else
+        class="h-4r w-4r"
+      />
       
-      <div class="w-max flex-child-1 flex-child mn-l-small w-100">
-        <p class="w-max h3 mn-b-thin">
-          <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="12" />
-        </p>
-
-        <div v-if="organization.ratingS" class="w-max star-container flex-v-center flex">
-          <span class="mn-r-thin pd-r-thin pd-l-thin pd-micro radius-small t-semi uppercase bg-main p-small">
-            {{organization.types[0]}}
-          </span> 
-
+      <div class="pos-relative w-100 flex-child-1 flex-child mn-l-small w-100">
+        
+        <!-- <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="18" class="h3 d-block"/> -->
+        <p class="h3 t-truncate">{{organization.profile.name}}</p>
+        <!-- RATING -->
+        <!-- <div v-if="showRating && organization.rating" class="w-max star-container flex-v-center flex">
           <img
             v-for="i in 5"
             class="i-small mn-r-thin"
@@ -33,48 +30,74 @@
 
           <span class="p-small t-semi mn-r-thin">{{organization.rating.median}}</span>
           <span class="p-small">({{organization.rating.amount}})</span>
-        </div>
+        </div> -->
 
-        <div>
-            <p class="mn-b-thin ">{{organization.numberOfSubscribers}} followers</p>
-            <ButtonToggleMembership
-              v-if="
-                user?._id 
-                && organization.owner !== user._id
-              "
-              :user="user._id"
-              :type="'organization'" 
-              :role="'subscriber'" 
-              :target="organization._id" 
-              :status="organization.isSubscriber" 
-              :text="{create: 'Follow', remove: 'Unfollow'}"
-              @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
-              class="w-min" 
-            />
-      
+        <Chips 
+          v-if="showTags && organization.profile.tags?.length > 0" 
+          :chips="organization.profile.tags.slice(0,3)"
+          class="pos-relative p-small"
+        />
+
+        <div v-if="showFollowers">
+          <p class="mn-b-thin">{{organization.numberOfSubscribers}} followers</p>
+
+          <ButtonToggleMembership
+            v-if="
+              user?._id 
+              && organization.owner !== user._id
+            "
+            :user="user._id"
+            :type="'organization'" 
+            :role="'subscriber'" 
+            :target="organization._id" 
+            :status="organization.isSubscriber" 
+            :text="{create: 'Follow', remove: 'Unfollow'}"
+            @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
+            class="w-min" 
+          />
         </div>
+
       </div>
+
     </div>
 
-    <div v-if="organization.products.length > 1000" class="pd-medium">
-      <div class="mn-b-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium">
-        <p class="t-black p-medium t-semi">
-          {{organization.products.length}} items:
-        </p>
-        <span class="mn-r-small">30-60min</span>
-        <span class="mn-r-auto">$50 min</span>
-      </div>
 
-      <div  class="d-block o-scroll flex-nowrap flex">
+    <div 
+      v-if="showProducts" 
+      class="mn-b-small mn-t-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium"
+    >
+      <IconTime class="i-medium mn-r-micro"/>
+      <span class="mn-r-thin">{{
+        organization.distance ? 
+          Math.ceil((5 + 5 + 3 * organization.distance) / 5) * 5 
+          + '-' 
+          + Math.ceil((15 + 5 + 3 * organization.distance) / 5) * 5 
+          + ' MIN' : 'Unavailable' 
+        }} 
+      </span>
+      <span v-if="organization.distance" class="t-transp mn-r-thin">|</span>
+      <span class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + ' KM' : ''}} </span>
+      <!-- <span class="mn-r-thin">{{organization.nearestSpotDistance}}</span> -->
+      <IconPrice class="i-medium mn-r-micro"/>
+      <span class="mn-r-thin">{{returnCurrency()}}500 </span>
+      <IconShopcart class="i-medium mn-r-micro"/>
+      <span class="mn-r-thin"> {{organization.products.length}} products</span>
+    </div>
+
+    <div v-if="showProducts && organization.products.length > 0" class="w-100 o-scroll">
+      <div class="w-max flex-nowrap flex gap-thin">
         <CardOrderItem  
           @click.stop="$router.push({name: 'Product Organization', params: {_id: organization._id, product: product._id}})" 
-          v-for="product in organization.products" 
+          v-for="product in organization.products.slice(0,10)" 
           :key="product._id" 
           :editable="false" 
           :product="product" 
-          class="pd-thin radius-medium w-15r br-solid br-grey br-1px bg-white mn-r-thin"
+          class="pd-thin w-15r radius-medium bg-white"
+         
         />
-        <button class="flex-center flex-nowrap flex shop-cart-item pd-thin radius-medium w-15r bg-main button">View menu</button>
+        <button class="pd-thin w-15r radius-medium bg-main button">
+          View menu
+        </button>
       </div>
     </div>
 
@@ -87,12 +110,41 @@
   import CardOrderItem from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue';
 
   import Text     from '@pf/src/components/Text/Text.vue'
+  import Chips  from '@pf/src/components/Chips/Chips.vue'
+
+  import PlaceholderOrganizationPic from '@pf/src/modules/icons/placeholders/PlaceholderOrganizationPic.vue'
+
+  import IconPrice from '@pf/src/modules/icons/entities/IconPrice.vue'
+  import IconShopcart from '@pf/src/modules/icons/entities/IconShopcart.vue'
+  import IconTime from '@pf/src/modules/icons/entities/IconTime.vue'
 
   import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
 
   const props = defineProps({
+    // Model
     user: String,
     organization: Object,
+    // View
+    showProducts: {
+      type: Boolean,
+      default: true
+    },
+    showFollowers: {
+      type: Boolean,
+      default: true
+    },
+    showRating: {
+      type: Boolean,
+      default: false
+    },
+    showFeatured: {
+      type: Boolean,
+      default: true
+    },
+    showTags: {
+      type: Boolean,
+      default: true
+    },
   });
 
   const emits = defineEmits(['updateMembership'])

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

@@ -12,7 +12,7 @@
 	       		fill="none" 
 	       		xmlns="http://www.w3.org/2000/svg"
 	       	>
-				<path fill="#00FF88" d="M62.2406 5.85971L75.413 32.6098L105.203 36.8654C110.472 37.676 112.498 44.3636 108.648 48.0113L87.1668 68.8844L92.2331 98.2689C93.2464 103.741 87.5721 107.591 82.9111 105.159L56.3637 91.3788L29.8163 105.159C25.1553 107.794 19.4811 103.741 20.4944 98.4716L25.5607 68.8844L4.07956 48.0113C0.22917 44.3636 2.25569 37.676 7.52464 36.8654L37.3145 32.6098L50.4868 5.85971C52.9186 0.996063 59.8088 0.996063 62.2406 5.85971Z" />
+				<path fill="rgb(var(--main))" d="M62.2406 5.85971L75.413 32.6098L105.203 36.8654C110.472 37.676 112.498 44.3636 108.648 48.0113L87.1668 68.8844L92.2331 98.2689C93.2464 103.741 87.5721 107.591 82.9111 105.159L56.3637 91.3788L29.8163 105.159C25.1553 107.794 19.4811 103.741 20.4944 98.4716L25.5607 68.8844L4.07956 48.0113C0.22917 44.3636 2.25569 37.676 7.52464 36.8654L37.3145 32.6098L50.4868 5.85971C52.9186 0.996063 59.8088 0.996063 62.2406 5.85971Z" />
 			</svg>
 		</div>
 		<p class="">Based on {{amount}} reviews</p>

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

@@ -22,6 +22,8 @@ import IconTwitter from '@pf/src/modules/icons/socials/twitter.vue'
 import IconReddit from '@pf/src/modules/icons/socials/reddit.vue'
 import IconLine from '@pf/src/modules/icons/socials/line.vue'
 import IconDribble from '@pf/src/modules/icons/socials/dribbble.vue'
+import IconYoutube from '@pf/src/modules/icons/socials/youtube.vue'
+
 
 const props = defineProps({
     telegram: {
@@ -51,6 +53,10 @@ const props = defineProps({
     dribbble: {
         type: String,
         default: ''
+    },
+    youtube: {
+        type: String,
+        default: ''
     }
 });
 
@@ -61,8 +67,9 @@ const socialLinks = computed(() => {
         {name: 'instagram', base: 'https://www.instagram.com/'},
         {name: 'twitter', base: 'https://twitter.com/'},
         {name: 'reddit', base: 'https://www.reddit.com/user/'},
-        {name: 'line', base: ''}, // не уверен в базовом URL для Line, добавьте его, если необходимо
-        {name: 'dribbble', base: 'https://dribbble.com/'}
+        {name: 'line', base: ''}, 
+        {name: 'dribbble', base: 'https://dribbble.com/'},
+        {name: 'youtube', base: 'https://youtube.com/@'}
     ];
 
     return networks
@@ -82,7 +89,8 @@ function resolveSocialIcon(name) {
         twitter: IconTwitter,
         reddit: IconReddit,
         line: IconLine,
-        dribbble: IconDribble
+        dribbble: IconDribble,
+        youtube: IconYoutube
     };
 
     return icons[name] || null;

package/src/modules/organizations/components/elements/ButtonToggleMembership.vue

@@ -2,7 +2,7 @@
   <Button
     :submit="toggleMembership"
     :showSucces="false"
-    class="button-small button"
+    class="bg-main  button-small button"
   >
   {{ !status ? props.text.create : props.text.remove }}
 </Button>

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

@@ -7,7 +7,7 @@
           <h2 class="w-100">{{ departments.state.department.name }}</h2>
 
           <svg @click="$router.push(`/app/organization/departments/${departments.state.department._id}/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="black"/>
+           <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>
 
         </div>

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

@@ -17,14 +17,14 @@
       </header>
     </div>
 
-    <div class="pd-b-zero pd-t-zero pd-thin cols-2 gap-thin">
+    <!-- <div class="pd-b-zero pd-t-zero pd-thin cols-2 gap-thin">
     
       <div class="flex-stretch flex-column flex">  
 
         <div class="mn-b-thin bg-grey pd-medium o-hidden radius-big">
           <h3 class="mn-b-semi">Profile</h3>
           
-          <div class="radius-small flex-nowrap flex">
+          <div v-if="departments.state.department.profile" class="radius-small flex-nowrap flex">
             <UploadImage 
                v-model:photo="departments.state.department.profile.photo"
               :uploadPath="'organizations/' + departments.state.department.name + '/avatars'"
@@ -139,7 +139,7 @@
         />
 
       </div>
-    </div>
+    </div> -->
 
     <section class="flex-nowrap flex pd-thin">
       <Button :submit="onDelete" :callback="redirectToDash" class="bg-grey">Delete Spot</Button>
@@ -255,7 +255,7 @@ async function fetchData() {
 
 fetchData();
 
-const members = ref(departments.state.department.members);
+// const members = ref(departments.state.department.members);
 
 const isOpenAddMemberPopup = ref(false);
 const selectedMember = ref(null);

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

@@ -6,10 +6,10 @@
         <p class="t-transp p-big">Добавляйте новых участников организации и настраивайте права доступа.</p> 
       </section>
 
-      <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
-        <IconEvents class="i-semi" :icon="true"/> 
-        <span>Departments</span>
-      </MenuItem> 
+      <FeedDepartments 
+        :organization="organization.state.current"
+        :memberships="members.state.memberships"
+      />
 
       <MembersAdd 
         :organization="organizationData"
@@ -30,6 +30,8 @@
 <script setup>
 import { ref,onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router'
+
+import FeedDepartments from '@pf/src/modules/organizations/components/sections/FeedDepartments.vue'
 import MembersAdd from '@pf/src/modules/organizations/components/sections/MembersAdd.vue';
 import MembersList from '@pf/src/modules/organizations/components/sections/MembersList.vue';
 // Mobile Module