From 3db065d4a97a7f184bb4900e8f854809757f35f1 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 12:10:50 +0530 Subject: [PATCH 1/8] Hide Profile --- app/components/public/session-item.hbs | 2 ++ app/components/public/session-item.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 925b31b4f74..7876a30eb40 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -88,6 +88,8 @@
{{speaker.name}}
+ {{speaker.position}}, {{speaker.organisation}} +
{{#if speaker.shortBiography}} {{sanitize speaker.shortBiography}} {{else if speaker.longBiography}} diff --git a/app/components/public/session-item.js b/app/components/public/session-item.js index 9e0928e102e..60822564919 100644 --- a/app/components/public/session-item.js +++ b/app/components/public/session-item.js @@ -1,9 +1,11 @@ import { action } from '@ember/object'; import Component from '@glimmer/component'; +import { tracked } from '@glimmer/tracking'; import { extractYoutubeUrl } from 'open-event-frontend/utils/url'; export default class SessionItem extends Component { - hideImage = false; + @tracked + hideImage = this.args.expanded; get youtubeLink() { return extractYoutubeUrl(this.args.session.videoUrl); From 991700eb56cab862f9898d010cff6df32d95f21e Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 12:17:29 +0530 Subject: [PATCH 2/8] Hide Profile-1 --- app/components/public/session-item.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/components/public/session-item.js b/app/components/public/session-item.js index 2b2cac05672..eee0093e2a8 100644 --- a/app/components/public/session-item.js +++ b/app/components/public/session-item.js @@ -1,5 +1,7 @@ import { action } from '@ember/object'; import Component from '@glimmer/component'; +import { tracked } from '@glimmer/tracking'; +import { extractYoutubeUrl } from 'open-event-frontend/utils/url'; export default class SessionItem extends Component { @tracked From 73bf9b51a927eb62787d0edc7f060c4406db95ab Mon Sep 17 00:00:00 2001 From: DIVYAM TAYAL Date: Sun, 29 Nov 2020 12:20:33 +0530 Subject: [PATCH 3/8] Update session-item.js --- app/components/public/session-item.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/components/public/session-item.js b/app/components/public/session-item.js index eee0093e2a8..4974234e61f 100644 --- a/app/components/public/session-item.js +++ b/app/components/public/session-item.js @@ -1,9 +1,13 @@ + import { action } from '@ember/object'; import Component from '@glimmer/component'; +import { inject as service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { extractYoutubeUrl } from 'open-event-frontend/utils/url'; export default class SessionItem extends Component { + @service router; + @tracked hideImage = this.args.expanded; From 137e339c50aa6b0ce0db5fde594ac1e6a95cef8f Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 14:43:03 +0530 Subject: [PATCH 4/8] Handle Brackets and comma --- app/components/public/session-item.hbs | 4 ++-- app/components/public/session-item.js | 3 +-- app/models/speaker.js | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 31079c4d222..7c5886a8f83 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -40,7 +40,7 @@
{{#each @session.speakers as |speaker|}} - {{speaker.name}} ({{speaker.position}}, {{speaker.organisation}}) + {{speaker.name}} {{#if (or speaker.position speaker.positionOrganisation)}}({{speaker.positionOrganisation}}){{/if}}
{{/each}}
@@ -119,7 +119,7 @@
{{speaker.name}}
- {{speaker.position}}, {{speaker.organisation}} + {{speaker.positionOrganisation}}
{{#if speaker.shortBiography}} {{sanitize speaker.shortBiography}} diff --git a/app/components/public/session-item.js b/app/components/public/session-item.js index 4974234e61f..d418e681a8a 100644 --- a/app/components/public/session-item.js +++ b/app/components/public/session-item.js @@ -1,4 +1,3 @@ - import { action } from '@ember/object'; import Component from '@glimmer/component'; import { inject as service } from '@ember/service'; @@ -7,7 +6,7 @@ import { extractYoutubeUrl } from 'open-event-frontend/utils/url'; export default class SessionItem extends Component { @service router; - + @tracked hideImage = this.args.expanded; diff --git a/app/models/speaker.js b/app/models/speaker.js index 49064be1cf8..0e9170f819a 100644 --- a/app/models/speaker.js +++ b/app/models/speaker.js @@ -1,6 +1,7 @@ import attr from 'ember-data/attr'; import ModelBase from 'open-event-frontend/models/base'; import { belongsTo, hasMany } from 'ember-data/relationships'; +import { computed } from '@ember/object'; export default class Speaker extends ModelBase.extend({ @@ -43,6 +44,10 @@ export default class Speaker extends ModelBase.extend({ event : belongsTo('event'), sessions : hasMany('session'), + positionOrganisation: computed('position', 'organization', function() { + return [this.position, this.organisation].filter(Boolean).join(', '); + }), + ready() { if (!this.complexFieldValues) { this.complexFieldValues = {}; From 160225f86e9390f27e2925e132705680cbcd1476 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 17:50:28 +0530 Subject: [PATCH 5/8] Enhance download/Link slides button --- app/components/public/session-item.hbs | 21 ++++++++------------- app/components/public/session-item.js | 10 ++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 7c5886a8f83..703bf1b050c 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -5,6 +5,12 @@

{{@session.title}} + {{#if @session.slidesUrl}} + + {{/if}} {{#if @session.microlocation.hasVideoStream}} - - {{/if}} - +
{{#if this.youtubeLink}} {{else if @session.videoUrl}} diff --git a/app/components/public/session-item.js b/app/components/public/session-item.js index d418e681a8a..8c64aa16b3f 100644 --- a/app/components/public/session-item.js +++ b/app/components/public/session-item.js @@ -23,6 +23,11 @@ export default class SessionItem extends Component { return slidesUrl?.indexOf('.pptx') > -1 || slidesUrl?.indexOf('.ppt') > -1; } + get slidesUploaded() { + const url = this.args.session.slidesUrl; + return url.startsWith('https://open-event-api-dev.herokuapp.com') || url.startsWith('https://api.eventyay.com'); + } + @action hideSpeakerImage() { this.hideImage = !this.hideImage; @@ -31,6 +36,11 @@ export default class SessionItem extends Component { } } + @action + goToSlides() { + window.open(this.args.session.slidesUrl, '_blank'); + } + @action goToStream() { const url = this.router.urlFor('public.stream.view', this.args.event?.identifier ?? this.args.session.get('event.identifier'), this.args.session.get('microlocation.videoStream.slugName'), this.args.session.get('microlocation.videoStream.id')); From 228e4e21c25c8cbb73447311720718a3327a2596 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 19:59:12 +0530 Subject: [PATCH 6/8] Done Changes --- app/components/public/session-item.hbs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 703bf1b050c..58b9f5920d3 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -8,7 +8,7 @@ {{#if @session.slidesUrl}} {{/if}} {{#if @session.microlocation.hasVideoStream}} @@ -33,7 +33,7 @@
{{#if @session.startsAt}}
{{@session.microlocation.name}}
-
{{general-date @session.startsAt tz=@timezone}} - {{general-date @session.endsAt tz=@timezone}}
+
{{general-date @session.startsAt 'D MMM, YYYY h:mm A (z)' tz=@timezone}}
{{/if}}
{{else}} @@ -46,7 +46,7 @@
{{#each @session.speakers as |speaker|}} - {{speaker.name}} {{#if (or speaker.position speaker.positionOrganisation)}}({{speaker.positionOrganisation}}){{/if}} + {{speaker.name}} {{#if speaker.positionOrganisation}}({{speaker.positionOrganisation}}){{/if}}
{{/each}}
@@ -67,9 +67,13 @@ {{sanitize @session.shortAbstract}} - {{#if (and @expanded @session.videoUrl)}} + {{#if (and @expanded (or @session.slidesUrl @session.videoUrl))}}
+ {{#if (or this.pdfLink this.pptLink)}} + + {{/if}} + {{#if this.youtubeLink}} {{else if @session.videoUrl}} From b2344544f9fef0bfe946010a5db2b797b115d8a1 Mon Sep 17 00:00:00 2001 From: DIVYAM TAYAL Date: Sun, 29 Nov 2020 20:00:42 +0530 Subject: [PATCH 7/8] Update session-item.hbs --- app/components/public/session-item.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 58b9f5920d3..2150397e78a 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -69,7 +69,7 @@
{{#if (and @expanded (or @session.slidesUrl @session.videoUrl))}}
-
+
{{#if (or this.pdfLink this.pptLink)}} {{/if}} From 17d52b40f8d1578cc640b18897696ec9dd672ef1 Mon Sep 17 00:00:00 2001 From: daretobedifferent18 Date: Sun, 29 Nov 2020 21:33:48 +0530 Subject: [PATCH 8/8] revert changes --- app/components/public/session-item.hbs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs index 58b9f5920d3..ad0fbf0c45a 100644 --- a/app/components/public/session-item.hbs +++ b/app/components/public/session-item.hbs @@ -72,6 +72,13 @@
{{#if (or this.pdfLink this.pptLink)}} + {{else if @session.slidesUrl}} + + + {{/if}} {{#if this.youtubeLink}}