From 8e59e2f06bd25d87f156f76c96c65277ad73c150 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 10 Jun 2021 10:33:16 +0200 Subject: [PATCH] Event components enhancements Signed-off-by: Thomas Citharel --- js/src/components/Event/EventBanner.vue | 2 +- js/src/components/Event/EventListCard.vue | 32 +- .../components/Event/EventMetadataBlock.vue | 2 +- js/src/components/Event/OrganizerPicker.vue | 4 +- .../Event/OrganizerPickerWrapper.vue | 8 +- js/src/views/Event/Event.vue | 569 +++++++++--------- 6 files changed, 309 insertions(+), 308 deletions(-) diff --git a/js/src/components/Event/EventBanner.vue b/js/src/components/Event/EventBanner.vue index bbdae2c67..1e82f0c38 100644 --- a/js/src/components/Event/EventBanner.vue +++ b/js/src/components/Event/EventBanner.vue @@ -22,7 +22,7 @@ export default class EventBanner extends Vue { .banner-container { display: flex; justify-content: center; - height: 400px; + height: 30vh; } ::v-deep img { width: 100%; diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue index bb2be7607..26f92609a 100644 --- a/js/src/components/Event/EventListCard.vue +++ b/js/src/components/Event/EventListCard.vue @@ -24,7 +24,7 @@

{{ participation.event.title }}

-
+
{{ participation.event.physicalAddress.locality }} - - - - - {{ organizerActor.displayName() }} - - - + + + {{ organizerActor.displayName() }} + + + {{ $t("Organized by you") }}
@@ -347,6 +352,7 @@ article.box { .list-card { display: flex; align-items: center; + padding: 0 6px; .actions { padding-right: 7.5px; diff --git a/js/src/components/Event/EventMetadataBlock.vue b/js/src/components/Event/EventMetadataBlock.vue index 6128c9e27..06c2f795f 100644 --- a/js/src/components/Event/EventMetadataBlock.vue +++ b/js/src/components/Event/EventMetadataBlock.vue @@ -23,7 +23,7 @@ export default class EventMetadataBlock extends Vue { h2 { font-size: 1.8rem; font-weight: 500; - color: #f7ba30; + color: $violet; } div.eventMetadataBlock { diff --git a/js/src/components/Event/OrganizerPicker.vue b/js/src/components/Event/OrganizerPicker.vue index 41f61b1c0..c9d8baf45 100644 --- a/js/src/components/Event/OrganizerPicker.vue +++ b/js/src/components/Event/OrganizerPicker.vue @@ -66,7 +66,9 @@ export default class OrganizerPicker extends Vue { return this.value; } if (this.currentActor) { - return this.currentActor; + return this.identities.find( + (identity) => identity.id === this.currentActor.id + ); } return undefined; } diff --git a/js/src/components/Event/OrganizerPickerWrapper.vue b/js/src/components/Event/OrganizerPickerWrapper.vue index e1af655dc..9bfaa8c91 100644 --- a/js/src/components/Event/OrganizerPickerWrapper.vue +++ b/js/src/components/Event/OrganizerPickerWrapper.vue @@ -110,6 +110,7 @@ import { IActor, IGroup, IPerson, usernameWithDomain } from "../../types/actor"; import OrganizerPicker from "./OrganizerPicker.vue"; import { CURRENT_ACTOR_CLIENT, + IDENTITIES, LOGGED_USER_MEMBERSHIPS, } from "../../graphql/actor"; import { Paginate } from "../../types/paginate"; @@ -152,6 +153,7 @@ const MEMBER_ROLES = [ }, update: (data) => data.loggedUser.memberships, }, + identities: IDENTITIES, }, }) export default class OrganizerPickerWrapper extends Vue { @@ -161,6 +163,8 @@ export default class OrganizerPickerWrapper extends Vue { currentActor!: IPerson; + identities!: IPerson[]; + isComponentModalActive = false; @Prop({ type: Array, required: false, default: () => [] }) @@ -200,7 +204,9 @@ export default class OrganizerPickerWrapper extends Vue { return this.value; } if (this.currentActor) { - return this.currentActor; + return this.identities.find( + (identity) => identity.id === this.currentActor.id + ); } return undefined; } diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue index 6b378ac80..a9e390f67 100755 --- a/js/src/views/Event/Event.vue +++ b/js/src/views/Event/Event.vue @@ -1,299 +1,296 @@