From a1a071c71576839a2a3ec358c97440607829d275 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Fri, 29 Oct 2021 08:15:36 +0530 Subject: [PATCH 1/5] fix: standard group card height --- app/components/promoted-group-card.js | 2 +- app/templates/components/promoted-group-card.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/promoted-group-card.js b/app/components/promoted-group-card.js index c3b0ca213b9..770f3171f50 100644 --- a/app/components/promoted-group-card.js +++ b/app/components/promoted-group-card.js @@ -81,6 +81,6 @@ get about() { if (this.group.about?.length > 100) { return this.group.about.slice(0, 100) + '...'; } - return this.group.about; + return this.group.about ? this.group.about : "No information given about group."; } } diff --git a/app/templates/components/promoted-group-card.hbs b/app/templates/components/promoted-group-card.hbs index 9dd91e2c41b..3c0b1bfd4cb 100644 --- a/app/templates/components/promoted-group-card.hbs +++ b/app/templates/components/promoted-group-card.hbs @@ -1,4 +1,4 @@ -
+
From 24ccee411a0db48b1b85bacc63e8fb0853586545 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Fri, 29 Oct 2021 08:16:19 +0530 Subject: [PATCH 2/5] f --- app/components/promoted-group-card.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/promoted-group-card.js b/app/components/promoted-group-card.js index 770f3171f50..10d181addbf 100644 --- a/app/components/promoted-group-card.js +++ b/app/components/promoted-group-card.js @@ -81,6 +81,6 @@ get about() { if (this.group.about?.length > 100) { return this.group.about.slice(0, 100) + '...'; } - return this.group.about ? this.group.about : "No information given about group."; + return this.group.about ? this.group.about : 'No information given about group.'; } } From 8a824b7e056fb3ee7c43baa05af1166d21edaa4e Mon Sep 17 00:00:00 2001 From: maze-runner Date: Sat, 30 Oct 2021 07:24:06 +0530 Subject: [PATCH 3/5] show banner url, in case thumbnail is not their --- app/components/promoted-group-card.js | 4 ++-- app/templates/components/promoted-group-card.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/promoted-group-card.js b/app/components/promoted-group-card.js index 10d181addbf..5f6517eecbf 100644 --- a/app/components/promoted-group-card.js +++ b/app/components/promoted-group-card.js @@ -78,8 +78,8 @@ get groupClass() { @computed('group') get about() { - if (this.group.about?.length > 100) { - return this.group.about.slice(0, 100) + '...'; + if (this.group.about?.length > 50) { + return this.group.about.slice(0, 50) + '...'; } return this.group.about ? this.group.about : 'No information given about group.'; } diff --git a/app/templates/components/promoted-group-card.hbs b/app/templates/components/promoted-group-card.hbs index 3c0b1bfd4cb..738a1917efb 100644 --- a/app/templates/components/promoted-group-card.hbs +++ b/app/templates/components/promoted-group-card.hbs @@ -1,7 +1,7 @@
- + From 687e567bd435f73ad8e409bff39212ad1b071926 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Sat, 30 Oct 2021 08:59:44 +0530 Subject: [PATCH 4/5] fixes https://github.com/fossasia/open-event-frontend/issues/8005 --- app/templates/components/group-card.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/group-card.hbs b/app/templates/components/group-card.hbs index 23dddff2875..9838ba8f00f 100644 --- a/app/templates/components/group-card.hbs +++ b/app/templates/components/group-card.hbs @@ -2,7 +2,7 @@ {{#unless this.device.isMobile}}
- +
{{/unless}} From 4b8f136103810cb3fae4400cc934daf4982dad83 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Sat, 30 Oct 2021 09:22:07 +0530 Subject: [PATCH 5/5] fix https://github.com/fossasia/open-event-frontend/issues/8004 --- app/templates/components/orders/event-info.hbs | 2 +- .../components/orders/ticket-holder.hbs | 16 ++++++++-------- app/templates/orders/new.hbs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs index 89113c1467d..b9c07e5faab 100644 --- a/app/templates/components/orders/event-info.hbs +++ b/app/templates/components/orders/event-info.hbs @@ -26,7 +26,7 @@
{{t 'From'}}: {{general-date this.data.event.startsAt 'date-time-long'}}
- {{t 'To'}}: {{general-date this.data.event.endsAt 'date-time-long'}} + {{t 'To'}}: {{general-date this.data.event.endsAt 'date-time-long'}} ({{this.data.event.timezone}}) {{#if this.data.event.ownerName}}
{{t 'Organized By'}}: {{this.data.event.ownerName}} diff --git a/app/templates/components/orders/ticket-holder.hbs b/app/templates/components/orders/ticket-holder.hbs index 32f325b694d..cbf3b3cf1c3 100644 --- a/app/templates/components/orders/ticket-holder.hbs +++ b/app/templates/components/orders/ticket-holder.hbs @@ -87,33 +87,33 @@ {{/if}} {{#if (eq this.data.paymentMode 'cheque')}}
-

+

{{t 'Cheque Details '}} -

+ {{this.data.event.chequeDetails}} {{else if (eq this.data.paymentMode 'onsite')}}
-

+

{{t 'Onsite Instructions'}} -

+ {{this.data.event.onsiteDetails}} {{else if (eq this.data.paymentMode 'cheque')}}
-

+

{{t 'Bank Details'}} -

+ {{this.data.event.bankDetails}} {{else if (eq this.data.paymentMode 'invoice')}}
-

+

{{t 'Invoice Details'}} -

+ {{this.data.event.invoiceDetails}} diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs index 274463257fe..9c30e5d8707 100644 --- a/app/templates/orders/new.hbs +++ b/app/templates/orders/new.hbs @@ -8,7 +8,7 @@
- {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}} + {{general-date this.model.order.event.startsAt 'date-time-long'}} - {{general-date this.model.order.event.endsAt 'date-time-long'}} ({{this.model.order.event.timezone}})
{{this.model.order.event.locationName}}