Skip to content

feat: Addition of Event End Date on Public Event Page #3019

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 3 commits into from
Jun 4, 2019
Merged

feat: Addition of Event End Date on Public Event Page #3019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
852d09a
Event End Time on Public Pages
May 27, 2019
5732bb8
Remoal of extra parenthesis
Jun 4, 2019
4442ccf
Merge branch 'development' into test
abhinavk96 Jun 4, 2019
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
4 changes: 4 additions & 0 deletions app/controllers/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Controller from '@ember/controller';
import moment from 'moment';
import { computed } from '@ember/object';

export default Controller.extend({
Expand All @@ -7,6 +8,9 @@ export default Controller.extend({
return this.get('session.currentRouteName') !== 'public.index';
}
}),
displayEndDate: computed('model.startsAtDate', 'model.endsAtDate', function() {
return !moment(this.model.startsAtDate).isSame(this.model.endsAtDate, 'minute');
}),
actions: {
toggleMenu() {
this.toggleProperty('isMenuOpen');
Expand Down
10 changes: 10 additions & 0 deletions app/styles/pages/public-event.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
margin: 0;
}

.event.time.ends {
font-size: 1.25rem;
margin: 0;
}


.event.location {
font-size: 1.5rem;
margin: 0;
Expand All @@ -91,6 +97,10 @@
font-size: 1.25rem;
}

.event.time.ends {
font-size: 1.15rem;
}

.event.location {
font-size: 1.25rem;
}
Expand Down
3 changes: 3 additions & 0 deletions app/templates/public.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<div class="one wide column"></div>
<div class="fifteen wide column">
<h4 class="event time">{{header-date model.startsAt model.timezone}}</h4>
{{#if displayEndDate}}
<h5 class="event time ends">{{t 'To'}} {{header-date model.endsAt model.timezone}}</h5>
{{/if}}
<h1 class="event name">{{model.name}}</h1>
<h4 class="event location"><i class="marker icon"></i>{{model.locationName}}</h4>
</div>
Expand Down