Skip to content

fix: standard group card height #8002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2021
Merged

fix: standard group card height #8002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1a071c
fix: standard group card height
maze-runnar Oct 29, 2021
24ccee4
f
maze-runnar Oct 29, 2021
8a824b7
show banner url, in case thumbnail is not their
maze-runnar Oct 30, 2021
687e567
fixes https://github.com/fossasia/open-event-frontend/issues/8005
maze-runnar Oct 30, 2021
4b8f136
fix https://github.com/fossasia/open-event-frontend/issues/8004
maze-runnar Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/components/promoted-group-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ 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;
return this.group.about ? this.group.about : 'No information given about group.';
}
}
2 changes: 1 addition & 1 deletion app/templates/components/group-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{#unless this.device.isMobile}}
<div class="ui card three wide computer six wide tablet column">
<a class="image" href={{href-to 'group-public' @group.id}}>
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl "/images/group.png"}} />
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl (if @group.bannerUrl @group.bannerUrl "/images/group.png")}} />
</a>
</div>
{{/unless}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/orders/event-info.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<br>
<strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt 'date-time-long'}}
<br>
<strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'date-time-long'}}
<strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'date-time-long'}} ({{this.data.event.timezone}})
{{#if this.data.event.ownerName}}
<br>
<strong>{{t 'Organized By'}}:</strong> {{this.data.event.ownerName}}
Expand Down
16 changes: 8 additions & 8 deletions app/templates/components/orders/ticket-holder.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,33 +87,33 @@
{{/if}}
{{#if (eq this.data.paymentMode 'cheque')}}
<div class="ui divider"></div>
<h2 class="weight-300">
<h4 class="weight-300">
{{t 'Cheque Details '}}
</h2>
</h4>
<span>
{{this.data.event.chequeDetails}}
</span>
{{else if (eq this.data.paymentMode 'onsite')}}
<div class="ui divider"></div>
<h2 class="weight-300">
<h4 class="weight-300">
{{t 'Onsite Instructions'}}
</h2>
</h4>
<span>
{{this.data.event.onsiteDetails}}
</span>
{{else if (eq this.data.paymentMode 'cheque')}}
<div class="ui divider"></div>
<h2 class="weight-300">
<h4 class="weight-300">
{{t 'Bank Details'}}
</h2>
</h4>
<span>
{{this.data.event.bankDetails}}
</span>
{{else if (eq this.data.paymentMode 'invoice')}}
<div class="ui divider"></div>
<h2 class="weight-300">
<h4 class="weight-300">
{{t 'Invoice Details'}}
</h2>
</h4>
<span>
{{this.data.event.invoiceDetails}}
</span>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/promoted-group-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="{{if this.isWide 'event wide ui grid row'}}" style="height: 100%;">
<div class="{{if this.isWide 'event wide ui grid row'}}" style="height: 400px;">
<div class="ui card {{this.groupClass}} {{if this.isWide 'h-auto' 'h-full'}}">
<a class="image" href={{href-to 'group-public' @group.id}}>
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl "/images/group.png"}} />
<Widgets::SafeImage @src={{if @group.thumbnailImageUrl @group.thumbnailImageUrl (if @group.bannerUrl @group.bannerUrl "/images/group.png")}} />
</a>
<span class="main content">
<SmartOverflow @class="header">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/orders/new.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="row">
<div class="column">
<div class="ui small gray-text">
{{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}})
<br>
{{this.model.order.event.locationName}}
</div>
Expand Down