@ozdao/martyrs 0.2.604 → 0.2.605

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

@@ -1,27 +1,27 @@
 <template>
   <div
     class="o-hidden pos-relative cursor-pointer bg-light "
-    @click="$router.push({ name: 'OrganizationProfile', params: { _id: organization._id } })"
+    @click="$router.push({ name: `${routePrefix}OrganizationProfile`, params: { _id: organization._id } })"
   >
     <div class="h-4r flex pos-relative">
 
       <img loading="lazy" 
         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" 
+        class="h-4r w-4r radius-small bg-white" 
         style="flex: 0 1 auto"
       />
 
       <PlaceholderOrganizationPic
         v-else
-        class="w-4r h-max radius-medium"
+        class="w-4r h-max radius-regular"
         style="flex: 0 1 auto"
       />
       
       <div class="pos-relative w-100 flex-h-center flex flex-column flex-child-1 flex-child mn-l-thin w-100">
         
         <!-- <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="18" class="h3 d-block"/> -->
-        <p class="h4 truncate w-100">{{organization.profile.name}}</p>
+        <p class="h4 mn-b-thin flex-child-default truncate w-100">{{organization.profile.name}}</p>
         <!-- RATING -->
         <!-- <div v-if="showRating && organization.rating" class="w-max star-container flex-v-center flex">
           <img loading="lazy" 
@@ -34,34 +34,31 @@
           <span class="p-small">({{organization.rating.amount}})</span>
         </div> -->
 
-        <div v-if="showFollowers ||  showTags" class="mn-t-micro gap-micro flex-nowrap flex">
-
-          <Chips 
-            v-if="showTags && organization.profile.tags?.length > 0" 
-            :chips="organization.profile.tags.slice(0,3)"
-            class="pos-relative t-trimmed"
-          >
-           <div v-if="showFollowers" class="truncate pos-relative p-regular mn-r-nano d-inline-block w-max pd-b-micro pd-t-micro pd-r-thin pd-l-thin radius-small fw-medium bg-white">
-            <p class="truncate">{{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: '+', remove: '-'}"
-              @updateMembership="event => emits('updateMembership', event, 'isSubscriber', 'numberOfSubscribers')"
-              class="i-medium" 
-            />
-          </div>
-        </Chips>
+        <div v-if="showFollowers" class="truncate mn-r-nano flex-child-default w-max p-regular pd-thin radius-thin fw-medium bg-white">
+          <p class="truncate">{{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: '+', remove: '-'}"
+            @updateMembership="event => emits('updateMembership', event, 'isSubscriber', 'numberOfSubscribers')"
+            class="i-medium" 
+          />
         </div>
 
+        <Chips 
+          v-if="showTags && organization.profile.tags?.length > 0" 
+          :chips="organization.profile.tags.slice(0,3)"
+          class="pos-relative t-trimmed"
+        />
+
       </div>
 
     </div>
@@ -71,7 +68,7 @@
       v-if="showProducts && organization.products" 
       class="mn-b-small ws-nowrap mn-t-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium"
     >
-      <IconTime class="i-medium t-transp mn-r-micro"/>
+      <IconTime class="i-medium opacity-50 mn-r-micro"/>
       <span class="mn-r-micro">
         {{
         organization.distance ? 
@@ -84,12 +81,12 @@
         }} 
       </span>
 
-      <span v-if="organization.distance && organization.distance < 50" class="t-transp t-dark mn-r-micro">|</span>
+      <span v-if="organization.distance && organization.distance < 50" class="opacity-50 t-dark mn-r-micro">|</span>
       <span v-if="organization.distance && organization.distance < 50" 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 t-transp mn-r-micro"/>
+      <IconShopcart class="i-medium opacity-50 mn-r-micro"/>
       <span class="mn-r-thin"> {{organization.products.length}} products</span>
     </div>
 

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

@@ -1,7 +1,7 @@
 <template>
   <section class="mn-b-big radius-medium pd-big bg-white">
     <h3 class="mn-b-regular">{{ title }}</h3>
-    <p class="mn-b-small t-transp p-regular">{{ description }}</p>
+    <p class="mn-b-small opacity-50 p-regular">{{ description }}</p>
 
     <button @click="callback" class="t-white bg-second w-100 button">
       {{ action }}

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

@@ -6,7 +6,7 @@
 	       	<svg 
 	       		v-for="i in 5" 
 	         	class="i-medium mn-r-small" 
-	         	:class="{'t-transp': i > rating}"
+	         	:class="{'opacity-50': i > rating}"
 	       		width="113" height="108" 
 	       		viewBox="0 0 113 108" 
 	       		fill="none" 

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

@@ -5,9 +5,9 @@
             :key="social.name"
             :href="social.href" 
             target="_blank" 
-            class="i-big bg-second t-white flex-nowrap flex-center flex radius-extra"
+            class="i-semi bg-second t-white flex-nowrap flex-center flex radius-extra"
         >
-            <component :is="resolveSocialIcon(social.name)" :fill="'rgb(var(--white))'" class="i-medium"></component>
+            <component :is="resolveSocialIcon(social.name)" :fill="'rgb(var(--white))'" class="i-small"></component>
         </a> 
     </div>
 </template>

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

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

package/src/modules/organizations/components/forms/AddExistingMembersForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="mn-b-thin t-transp p-regular">Select users to add to the organization:</p>
+    <p class="mn-b-thin opacity-50 p-regular">Select users to add to the organization:</p>
 
     <Feed
       :search="{
@@ -44,7 +44,7 @@
           
           <div class="w-100">
             <p class="fw-medium">{{ user.profile?.name || user.phone || user.email || 'Unnamed user' }}</p>
-            <p class="t-small t-transp">{{ user.email || user.phone || 'No contact info' }}</p>
+            <p class="t-small opacity-50">{{ user.email || user.phone || 'No contact info' }}</p>
           </div>
 
           <div v-if="isUserInOrganization(user)" class="pd-nano pd-h-thin radius-thin bg-grey">
@@ -59,7 +59,7 @@
     </Feed>
 
     <div v-if="selectedUsers.length > 0" class="mn-b-thin">
-      <p class="t-small t-transp">Selected: {{ selectedUsers.length }} user(s)</p>
+      <p class="t-small opacity-50">Selected: {{ selectedUsers.length }} user(s)</p>
     </div>
 
     <Button

package/src/modules/organizations/components/forms/DepartmentForm.vue

@@ -195,7 +195,7 @@ import Block from '@martyrs/src/components/Block/Block.vue';
 import Feed from '@martyrs/src/components/Feed/Feed.vue';
 import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.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';
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';
 
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';

package/src/modules/organizations/components/forms/InviteForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="mn-b-thin t-transp p-regular">{{ text }}</p> 
+    <p class="mn-b-thin opacity-50 p-regular">{{ text }}</p> 
 
     <section class="cols-1 mn-b-small radius-medium pd-semi bg-light pos-relative">
       <div

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

@@ -28,7 +28,7 @@
           </router-link>
 
         </div>
-        <p class="t-transp p-medium" v-html="departmentsStore.state.items[0].description"></p>
+        <p class="opacity-50 p-medium" v-html="departmentsStore.state.items[0].description"></p>
       </section>
 
      <section class="mn-b-medium radius-medium pd-semi bg-white">
@@ -64,7 +64,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue';
 import { DepartmentSub, departmentsStore } from '@martyrs/src/modules/organizations/organizations.client.js';
-import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
+import User from '@martyrs/src/modules/core/views/components/blocks/CardUser.vue';
 
 import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 

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

@@ -222,7 +222,7 @@ import {
   membershipsStore 
 } from "@martyrs/src/modules/organizations/organizations.client.js";
 
-import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'
+import CardUser from '@martyrs/src/modules/core/views/components/blocks/CardUser.vue'
 
 import * as globals from "@martyrs/src/modules/core/views/store/core.store.js";
 

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

@@ -1,7 +1,7 @@
 <template>
   <div class="pd-thin">
     <div v-if="!isLoaded" class="flex-center flex h-20r">
-      <span class="t-transp">Loading...</span>
+      <span class="opacity-50">Loading...</span>
     </div>
     <div v-else>
     <!-- Members Section -->
@@ -9,7 +9,7 @@
       <SectionPageTitle
         :title="`Members ${organizationData?.numberOfMembers ? `(${organizationData.numberOfMembers})` : ''}`"
         :actions="[
-          { method: openAddUsersPopup, label: 'Add user to organization' }
+          { method: openAddUsersPopup, label: '+ Add Member' }
         ]"
         class="mn-b-small bg-light radius-medium pd-medium"
       />
@@ -65,7 +65,7 @@
       <SectionPageTitle
         title="Departments"
         :actions="[
-          { method: () => openDepartmentPopup(), label: 'Add department' }
+          { method: () => openDepartmentPopup(), label: '+ Add Department' }
         ]"
         class="mn-b-small bg-light bg-light radius-medium pd-medium"
       />
@@ -107,7 +107,7 @@
       <SectionPageTitle
         title="Invites"
         :actions="[
-          { method: openInvitePopup, label: 'Invite members' }
+          { method: openInvitePopup, label: '+ Invite Members' }
         ]"
         class="mn-b-small bg-light bg-light radius-medium pd-medium"
       />
@@ -207,7 +207,7 @@
       title="Invite members"
       @close-popup="closeInvitePopup" 
       :isPopupOpen="isOpenInvitePopup"
-      class="bg-white w-min-30r w-max-30r radius-medium pd-medium"
+      class="bg-white w-clamp-30r-30r-100 radius-medium pd-medium"
     >
       <InviteForm 
         v-if="organizationData"
@@ -221,7 +221,7 @@
       title="Add users to organization"
       @close-popup="closeAddUsersPopup" 
       :isPopupOpen="isOpenAddUsersPopup"
-      class="bg-white w-min-40r w-max-50r radius-medium pd-medium"
+      class="bg-white w-clamp-40r-50r-100 radius-medium pd-medium"
     >
       <AddExistingMembersForm 
         :organizationId="route.params._id"
@@ -235,7 +235,7 @@
       @close-popup="closeDepartmentPopup"
       :isPopupOpen="isDepartmentPopupOpen"
       align="center right"
-      class="bg-white h-min-100 w-max-50r pd-medium"
+      class="bg-white h-min-100 w-clamp-0-50r-100 pd-medium"
     >
       <DepartmentForm
         :department="editingDepartment"
@@ -268,7 +268,7 @@ import {
   storeOrganizations as organization
 } from '@martyrs/src/modules/organizations/organizations.client.js';
 
-import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
+import CardUser from '@martyrs/src/modules/core/views/components/blocks/CardUser.vue';
 
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue';