@eturnity/eturnity_reusable_components 7.2.2 → 7.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.2.2",
+  "version": "7.4.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -63,4 +63,4 @@
   "author": "Aaron Enser",
   "license": "ISC",
   "homepage": "https://bitbucket.org/eturnitydevs/eturnity_reusable_components#readme"
-}
+}

package/src/components/projectMarker/index.vue

@@ -9,10 +9,7 @@
       :isEditionAllowed="editionAllowed"
       :isActive="activated"
       :cursor="cursor"
-      @click.native="editionAllowed
-        ? activated = !activated
-        : ''
-      "
+      @click.native="editionAllowed ? (activated = !activated) : ''"
     >
       <icon
         v-if="!!iconName"
@@ -22,10 +19,7 @@
         :cursor="cursor"
       />
       <span>{{ markerData.translations[activeLanguage].name }}</span>
-      <dot-wrapper
-        v-if="editionAllowed"
-        class="dotContainer"
-      >
+      <dot-wrapper v-if="editionAllowed" class="dotContainer">
         <dot-icon />
         <dot-icon />
         <dot-icon />
@@ -40,10 +34,7 @@
         </edit-item>
         <edit-item @click.native="onEditClick">
           <icon-container>
-            <icon
-              name="edit_button"
-              size="14px"
-            />
+            <icon name="edit_button" size="14px" />
           </icon-container>
           <div>{{ $gettext('Edit') }}</div>
         </edit-item>
@@ -61,10 +52,7 @@
         <page-title :text="$gettext('delete_confirm_text')" />
         <page-subtitle :text="$gettext('delete_confirm_subtext')" />
         <cta-container>
-          <main-button
-            @click.native="onDelete"
-            :text="$gettext('Delete')"
-          />
+          <main-button @click.native="onDelete" :text="$gettext('Delete')" />
           <main-button
             type="cancel"
             @click.native="closeDeleteModal"
@@ -90,8 +78,8 @@
 //   @deleteHandler="onMarkerDelete($event)"
 // />
 
-import styled from "vue-styled-components"
-import Icon from "../icon"
+import styled from 'vue-styled-components'
+import Icon from '../icon'
 import Modal from '../modals/modal'
 import PageTitle from '../pageTitle'
 import DeleteIcon from '../deleteIcon'
@@ -128,22 +116,22 @@ const MarkerAttrs = {
 const MarkerContainer = styled('div', MarkerAttrs)`
   display: grid;
   grid-template-columns: ${(props) =>
-  props.hasIcon || props.isEditionAllowed ? 'auto 1fr' : '1fr'};
+    props.hasIcon || props.isEditionAllowed ? 'auto 1fr' : '1fr'};
   grid-gap: 5px;
   position: relative;
   align-items: center;
   padding: 2px 7px;
   color: ${(props) => props.theme.colors.white};
   background-color: ${(props) =>
-  props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
-<<<<<<< HEAD
-  border-radius: ${(props) => (props.hasBorderRadius ? '4px' : '0')};
-=======
-  border: 1px solid ${(props) => props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
-  border-radius: ${(props) => props.withDate ? '4px 0 0 4px' : '4px'};
->>>>>>> origin/EPDM-9185
+    props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
+  border: 1px solid
+    ${(props) =>
+      props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
+  border-radius: ${(props) =>
+    props.hasBorderRadius ? (props.withDate ? '4px 0 0 4px' : '4px') : '0'};
+
   white-space: nowrap;
-  cursor: ${(props) => props.isEditionAllowed ? 'pointer' : props.cursor};
+  cursor: ${(props) => (props.isEditionAllowed ? 'pointer' : props.cursor)};
 
   .dotContainer {
     display: ${(props) => (props.isActive ? 'flex' : 'none')};
@@ -207,7 +195,7 @@ const Date = styled.div`
 `
 
 export default {
-  name: "project-marker",
+  name: 'project-marker',
   components: {
     PageContainer,
     MarkerContainer,
@@ -266,7 +254,11 @@ export default {
   },
   computed: {
     editionAllowed() {
-      return (this.markerData.can_be_deleted && (!this.isLimitedPartner || this.isGroupSupport)) && this.isEditable
+      return (
+        this.markerData.can_be_deleted &&
+        (!this.isLimitedPartner || this.isGroupSupport) &&
+        this.isEditable
+      )
     },
     iconName() {
       if (this.markerData.choice === 'sold') {
@@ -288,11 +280,11 @@ export default {
       this.deleteModalOpened = false
     },
     onEditClick() {
-      this.$emit("editHandler")
+      this.$emit('editHandler')
     },
     onDelete() {
       this.closeDeleteModal()
-      this.$emit("deleteHandler")
+      this.$emit('deleteHandler')
     }
   }
 }