From f04f570ef57b83e4eef062b0f42ca5b54b7b76c9 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Fri, 18 Aug 2023 02:21:54 +0200 Subject: [PATCH 01/22] Translated using Weblate (Swedish) (#9141) Currently translated at 99.9% (2552 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ Co-authored-by: Mario Behling --- translations/sv.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/translations/sv.po b/translations/sv.po index 5cdcc7c7ccd..b6a806a327c 100644 --- a/translations/sv.po +++ b/translations/sv.po @@ -6,14 +6,16 @@ # Kristoffer Grundström , 2021, 2023. # tygyh , 2022, 2023. # Hong Phuc Dang , 2023. +# Mario Behling , 2023. msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-07-04 04:51+0000\n" -"Last-Translator: Anonymous \n" -"Language-Team: Swedish \n" +"PO-Revision-Date: 2023-08-17 17:53+0000\n" +"Last-Translator: Mario Behling \n" +"Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8508,7 +8510,7 @@ msgstr "Utställningsglas" #: app/templates/components/public/featured-speaker-list.hbs:1:18 msgid "Featured Speakers" -msgstr "Utvalda högtalare" +msgstr "Utvalda talare" #: app/templates/components/public/featured-speaker-list.hbs:10:66 msgid "More Speakers" From a341a19dc768fef6e39e12d0cf874137686287ac Mon Sep 17 00:00:00 2001 From: nnhathung <139526485+nnhathung@users.noreply.github.com> Date: Fri, 18 Aug 2023 07:43:44 +0700 Subject: [PATCH 02/22] Feature-9082: Enhance language dropdown button (#9131) * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * fix css * fix UI * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * avoid using css inline * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * fix-9082 language dropdown not showing up * fix-9082 language dropdown not showing up --------- Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> Co-authored-by: ntthitrinh --- app/components/public/stream/side-panel.hbs | 2 +- app/components/public/stream/side-panel.ts | 26 ++++++++++++++++----- app/models/video-stream.ts | 1 + 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app/components/public/stream/side-panel.hbs b/app/components/public/stream/side-panel.hbs index 4f69d01352e..582416ee737 100644 --- a/app/components/public/stream/side-panel.hbs +++ b/app/components/public/stream/side-panel.hbs @@ -59,7 +59,7 @@
- {{#each this.streams as |stream|}} + {{#each this.streamList as |stream|}} {{truncate (uppercase stream.name) 1 false}} {{stream.name}} diff --git a/app/components/public/stream/side-panel.ts b/app/components/public/stream/side-panel.ts index 6c593fb1681..271b14a93d8 100644 --- a/app/components/public/stream/side-panel.ts +++ b/app/components/public/stream/side-panel.ts @@ -46,6 +46,7 @@ export default class PublicStreamSidePanel extends Component { @tracked showChat = false; @tracked showRoomChat = false; @tracked showVideoRoom = false; + @tracked languageList: any = []; @tracked translationChannels = [{ id : '0', @@ -147,14 +148,22 @@ export default class PublicStreamSidePanel extends Component { isGlobalEventRoom : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['is-global-event-room'])[0], chatRoomName : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['chat-room-name'])[0], microlocationId : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.id)[0], - hash : stringHashCode(stream.attributes.name + stream.id) - })).forEach(async(stream: any) => { + hash : stringHashCode(stream.attributes.name + stream.id), + translations : [] + })).forEach((stream: any) => { this.addStream(stream) }); - this.streams.forEach(async(stream: any) => { - const res = await this.fetchTranslationChannels(stream.id) - stream.translations = res - }); + const languageLists: any = []; + Promise.all(this.streams.map(async(stream: any) => { + const res = await this.fetchTranslationChannels(stream.id); + const item = { + streamId: stream.id + } + languageLists.push(item); + stream.translations = res; + })).then(() => { + this.languageList = languageLists; + }) } catch (e) { console.error('Error while loading rooms in video stream', e); } @@ -174,4 +183,9 @@ export default class PublicStreamSidePanel extends Component { this.loading = false; this.streams = [...this.streams]; } + + @computed('languageList.@each.streamId') + get streamList() { + return this.streams; + } } diff --git a/app/models/video-stream.ts b/app/models/video-stream.ts index 9376f6c1714..423845e7f9f 100644 --- a/app/models/video-stream.ts +++ b/app/models/video-stream.ts @@ -35,6 +35,7 @@ export default class VideoStream extends ModelBase.extend() { @attr() additionalInformation!: string; @attr() extra!: Extra; @attr() chatRoomName?: string; + @attr() translations?: any[]; @hasMany('microlocation') rooms!: Microlocation[]; @hasMany('video-recording') videoRecordings!: VideoRecording[]; From 498add540be07bf1d31bb21f86302415817d3c85 Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:46:46 +0700 Subject: [PATCH 03/22] fix-7016: Link redirect of current day results in user forward to wrong filtered page (#9145) * fix-7016: Link redirect of current day results in user forward to wrong filtered page * fix-7016: Link redirect of current day results in user forward to wrong filtered page --- app/routes/public/cfs/edit-speaker.js | 4 ++-- app/routes/public/sessions.js | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/routes/public/cfs/edit-speaker.js b/app/routes/public/cfs/edit-speaker.js index ebad0618777..c65891ef71a 100644 --- a/app/routes/public/cfs/edit-speaker.js +++ b/app/routes/public/cfs/edit-speaker.js @@ -9,7 +9,7 @@ export default class EditSpeakerRoute extends Route { async model(params) { const eventDetails = this.modelFor('public'); - const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' }) + const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' }); return { event : eventDetails, forms : await eventDetails.query('customForms', { @@ -24,4 +24,4 @@ export default class EditSpeakerRoute extends Route { speaker }; } -} \ No newline at end of file +} diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js index 9077cd5a63b..61a62bafd6e 100644 --- a/app/routes/public/sessions.js +++ b/app/routes/public/sessions.js @@ -2,8 +2,6 @@ import classic from 'ember-classic-decorator'; import Route from '@ember/routing/route'; import moment from 'moment-timezone'; -let isDateFilterActive = Boolean(new URLSearchParams(location.search).get('date')); - @classic export default class SessionsRoute extends Route { queryParams = { @@ -46,9 +44,10 @@ export default class SessionsRoute extends Route { async beforeModel() { const event = this.modelFor('public'); const dates = await this.loader.load('/events/' + event.id + '/sessions/dates'); - if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD')) && !isDateFilterActive) { - isDateFilterActive = true; - this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } }); + if (new URLSearchParams(location.search).size === 0) { + if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD'))) { + this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } }); + } } } From 47a50e898a1aecfbdac6268d68bada725ec8be8a Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:48:36 +0700 Subject: [PATCH 04/22] feature-9082: Enhance language dropdown button (#9142) * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * fix css * fix UI * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * avoid using css inline * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * fix-9082 language dropdown not showing up * fix-9082 language dropdown not showing up * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button --------- Co-authored-by: nnhathung Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> Co-authored-by: ntthitrinh --- app/components/public/stream/video-stream.hbs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/components/public/stream/video-stream.hbs b/app/components/public/stream/video-stream.hbs index c210fab2da5..e660746ea06 100644 --- a/app/components/public/stream/video-stream.hbs +++ b/app/components/public/stream/video-stream.hbs @@ -8,19 +8,16 @@ -{{/if}} - {{#if (eq @videoStream.videoChannel.provider 'jitsi')}} {{/if}} {{#if (eq this.provider 'youtube')}} - {{/if}} {{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}} From b4307ec7ad13a17e09a5610db44cf089cf305135 Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:51:05 +0700 Subject: [PATCH 05/22] fix-9080: There was no result for searching with Ticket price "0.0" (#9115) * fix-9080: There was no result for searching with Ticket price 0.0 * fix-9080: There was no result for searching with Ticket price 0.0 --------- Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> --- app/mixins/ember-table-route.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mixins/ember-table-route.js b/app/mixins/ember-table-route.js index d93fff10ccc..ecaf8de82c9 100644 --- a/app/mixins/ember-table-route.js +++ b/app/mixins/ember-table-route.js @@ -109,8 +109,8 @@ export default Mixin.create({ if (isNaN(params.search)) { continue; } - condition = 'eq'; - value = params.search; + condition = params.search && Number(params.search) !== 0 ? 'eq' : 'is_'; + value = params.search && Number(params.search) !== 0 ? params.search : null; } const filter = { name : splitField[0], From 2ba0fe3a267499409b7cc1ad93cdda6ad75bffb2 Mon Sep 17 00:00:00 2001 From: Khang On - TMA <135116292+khangon@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:52:32 +0700 Subject: [PATCH 06/22] fix-9139: The Expired tab of Access Codes Page has navigated wrong throught Discount Codes Page. (#9144) --- app/templates/events/view/tickets/access-codes.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/events/view/tickets/access-codes.hbs b/app/templates/events/view/tickets/access-codes.hbs index ab9bdb2b542..a84eb35bf58 100644 --- a/app/templates/events/view/tickets/access-codes.hbs +++ b/app/templates/events/view/tickets/access-codes.hbs @@ -24,7 +24,7 @@ {{t 'Inactive'}} - + {{t 'Expired'}} From 8ef23c3ab48b18df8d90a2376323ac8955ebc884 Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:54:10 +0700 Subject: [PATCH 07/22] fix-9076: Cannot show all entries when selecting "Show All" in View Attendees page (#9078) * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page * fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page --------- Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> --- app/mixins/ember-table-route.js | 1 + app/routes/events/view/tickets/attendees/list.js | 2 +- app/styles/partials/utils.scss | 4 ++++ app/templates/components/tables/default.hbs | 2 +- app/templates/components/tables/utilities/page-size-input.hbs | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/mixins/ember-table-route.js b/app/mixins/ember-table-route.js index ecaf8de82c9..6ae69c88766 100644 --- a/app/mixins/ember-table-route.js +++ b/app/mixins/ember-table-route.js @@ -19,6 +19,7 @@ export default Mixin.create({ refreshModel: true } }, + per_page: 10, applySearchFilters(options, params, searchFields) { if (!Array.isArray(searchFields)) { diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js index dd406ca3df5..5337c76614e 100644 --- a/app/routes/events/view/tickets/attendees/list.js +++ b/app/routes/events/view/tickets/attendees/list.js @@ -71,7 +71,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { let queryString = { include : 'user,order', filter : filterOptions, - 'page[size]' : params.per_page || 10, + 'page[size]' : params.per_page, 'page[number]' : params.page || 1 }; diff --git a/app/styles/partials/utils.scss b/app/styles/partials/utils.scss index e017160f0e2..9fb38e138d1 100644 --- a/app/styles/partials/utils.scss +++ b/app/styles/partials/utils.scss @@ -246,6 +246,10 @@ padding: 1rem !important; } +.z-index-0 { + z-index: 0 !important; +} + .mt-0 { margin-top: 0 !important; } diff --git a/app/templates/components/tables/default.hbs b/app/templates/components/tables/default.hbs index eaa3d1eec7b..b15cabbfcdb 100644 --- a/app/templates/components/tables/default.hbs +++ b/app/templates/components/tables/default.hbs @@ -14,7 +14,7 @@
{{/unless}}
-
+
{{t 'Show'}} -
{{this.pageSize}}
+
{{if (eq this.pageSize 0) 'All' this.pageSize}}
{{#each this.sizes as |size|}} From 3447f60a9a2f4260bdfbbf61567328ea081550ec Mon Sep 17 00:00:00 2001 From: Khang On - TMA <135116292+khangon@users.noreply.github.com> Date: Thu, 24 Aug 2023 23:05:51 +0700 Subject: [PATCH 08/22] =?UTF-8?q?fix-9154:=20[Badge=20Wizard]=20Showing=20?= =?UTF-8?q?=20tag=20in=20custom=20field=20when=20organiz=E2=80=A6=20(#9?= =?UTF-8?q?157)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix-9154: [Badge Wizard] Showing tag in custom field when organizer tries to add custom question to badge * fix-9154: [Badge Wizard] Showing tag in custom field when organizer tries to add custom question to badge --- app/helpers/value-field-link.js | 12 ++++++++++++ .../components/forms/wizard/badge-field-form.hbs | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 app/helpers/value-field-link.js diff --git a/app/helpers/value-field-link.js b/app/helpers/value-field-link.js new file mode 100644 index 00000000000..556e77af9c5 --- /dev/null +++ b/app/helpers/value-field-link.js @@ -0,0 +1,12 @@ +import { helper } from '@ember/component/helper'; +import { htmlSafe } from '@ember/string'; + +export function valueFieldLink(data) { + let field = ''; + if(data){ + field = data; + } + return htmlSafe(field); +} + +export default helper(valueFieldLink); diff --git a/app/templates/components/forms/wizard/badge-field-form.hbs b/app/templates/components/forms/wizard/badge-field-form.hbs index e7ee8dbe77a..7088924abaa 100644 --- a/app/templates/components/forms/wizard/badge-field-form.hbs +++ b/app/templates/components/forms/wizard/badge-field-form.hbs @@ -40,7 +40,7 @@ {{#if this.data.custom_field}}
- {{t-var this.data.custom_field}} + {{value-field-link (t-var this.data.custom_field)}}
{{else}}
@@ -55,8 +55,8 @@
{{else}} {{#if cfield.isComplex}} -
- {{rich-text-link cfield.isComplex}} +
+ {{value-field-link cfield.isComplex}}
{{/if}} {{/if}} @@ -85,7 +85,7 @@ {{#each this.getQrFields as |field|}} {{#if field}}
- {{field.name}} + {{value-field-link field.name}}
{{/if}} {{/each}} From 46741b83ab2b39fc16fc43bc834ced308ebeb594 Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Thu, 24 Aug 2023 23:06:34 +0700 Subject: [PATCH 09/22] feature-9020: Filter options for orders and attendees not working (#9150) * feature-9020: Filter options for orders and attendees not working * feature-9020: Filter options for orders and attendees not working * feature-9020: Filter options for orders and attendees not working * feature-9020: Filter options for orders and attendees not working * feature-9020: Fix UI filter date * feature-9020: Fix UI filter date * feature-9020: Fix UI filter date at the order * feature-9020: Filter options for orders and attendees not working --------- Co-authored-by: odkhang Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> --- .../events/view/tickets/attendees.js | 62 +++++++++++++ app/controllers/events/view/tickets/orders.js | 62 +++++++++++++ app/mixins/ember-table-route.js | 9 ++ .../events/view/tickets/attendees/list.js | 54 +++++++++-- app/routes/events/view/tickets/orders/list.js | 28 +++++- app/styles/components/ticket-list.scss | 12 +++ app/styles/partials/utils.scss | 4 + .../components/widgets/forms/date-picker.hbs | 2 +- .../events/view/tickets/attendees.hbs | 90 ++++++++++++++++-- app/templates/events/view/tickets/orders.hbs | 92 +++++++++++++++++-- 10 files changed, 390 insertions(+), 25 deletions(-) diff --git a/app/controllers/events/view/tickets/attendees.js b/app/controllers/events/view/tickets/attendees.js index 6e779ce7d52..5716500f0ee 100644 --- a/app/controllers/events/view/tickets/attendees.js +++ b/app/controllers/events/view/tickets/attendees.js @@ -2,12 +2,19 @@ import classic from 'ember-classic-decorator'; import { action } from '@ember/object'; import Controller from '@ember/controller'; import { run } from '@ember/runloop'; +import { tracked } from '@glimmer/tracking'; @classic export default class AttendeesController extends Controller { isLoadingcsv = false; isLoadingpdf = false; + @tracked + start_date = this.router.currentRoute.queryParams?.start_date; + + @tracked + end_date = this.router.currentRoute.queryParams?.end_date; + @action export(mode) { this.set(`isLoading${mode}`, true); @@ -23,6 +30,61 @@ export default class AttendeesController extends Controller { }); } + @action + attendeeFilter(name) { + if (name === 'date') { + if (!this.start_date || !this.end_date) { + this.router.transitionTo('events.view.tickets.attendees.list', { + queryParams: { + filter: name + } + }); + return; + } + this.router.transitionTo('events.view.tickets.attendees.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : name + } + }); + } else { + this.router.transitionTo('events.view.tickets.attendees.list', { + queryParams: { + filter: name + } + }); + } + } + + @action + onChangeStartDate() { + if (!this.end_date) { + return; + } + this.router.transitionTo('events.view.tickets.attendees.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : 'date' + } + }); + } + + @action + onChangeEndDate() { + if (!this.start_date) { + return; + } + this.router.transitionTo('events.view.tickets.attendees.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : 'date' + } + }); + } + requestLoop(exportJobInfo, mode) { run.later(() => { this.loader diff --git a/app/controllers/events/view/tickets/orders.js b/app/controllers/events/view/tickets/orders.js index aca34801722..642052de877 100644 --- a/app/controllers/events/view/tickets/orders.js +++ b/app/controllers/events/view/tickets/orders.js @@ -2,12 +2,19 @@ import classic from 'ember-classic-decorator'; import { action } from '@ember/object'; import Controller from '@ember/controller'; import { run } from '@ember/runloop'; +import { tracked } from '@glimmer/tracking'; @classic export default class OrdersController extends Controller { isLoadingcsv = false; isLoadingpdf = false; + @tracked + start_date = this.router.currentRoute.queryParams?.start_date; + + @tracked + end_date = this.router.currentRoute.queryParams?.end_date; + @action export(mode) { this.set(`isLoading${mode}`, true); @@ -23,6 +30,61 @@ export default class OrdersController extends Controller { }); } + @action + orderFilter(name) { + if (name === 'date') { + if (!this.start_date || !this.end_date) { + this.router.transitionTo('events.view.tickets.orders.list', { + queryParams: { + filter: name + } + }); + return; + } + this.router.transitionTo('events.view.tickets.orders.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : name + } + }); + } else { + this.router.transitionTo('events.view.tickets.orders.list', { + queryParams: { + filter: name + } + }); + } + } + + @action + onChangeStartDate() { + if (!this.end_date) { + return; + } + this.router.transitionTo('events.view.tickets.orders.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : 'date' + } + }); + } + + @action + onChangeEndDate() { + if (!this.start_date) { + return; + } + this.router.transitionTo('events.view.tickets.orders.list', { + queryParams: { + start_date : this.start_date, + end_date : this.end_date, + filter : 'date' + } + }); + } + requestLoop(exportJobInfo, mode) { run.later(() => { this.loader diff --git a/app/mixins/ember-table-route.js b/app/mixins/ember-table-route.js index 6ae69c88766..c4d38d97d68 100644 --- a/app/mixins/ember-table-route.js +++ b/app/mixins/ember-table-route.js @@ -12,6 +12,15 @@ export default Mixin.create({ search: { refreshModel: true }, + filter: { + refreshModel: true + }, + start_date: { + refreshModel: true + }, + end_date: { + refreshModel: true + }, sort_dir: { refreshModel: true }, diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js index 5337c76614e..a68b76254b6 100644 --- a/app/routes/events/view/tickets/attendees/list.js +++ b/app/routes/events/view/tickets/attendees/list.js @@ -1,5 +1,6 @@ import Route from '@ember/routing/route'; import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route'; +import moment from 'moment-timezone'; export default class extends Route.extend(EmberTableRouteMixin) { titleToken() { @@ -23,6 +24,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { async model(params) { this.set('params', params); + const eventDetails = this.modelFor('events.view'); let filterOptions = []; if (params.attendees_status === 'checkedIn') { filterOptions = [ @@ -40,20 +42,52 @@ export default class extends Route.extend(EmberTableRouteMixin) { val : false } ]; - } else if (params.attendees_status === 'all') { - filterOptions = []; } else { - filterOptions = [ - { + if (params.attendees_status !== 'all') { + filterOptions = [ + { + name : 'order', + op : 'has', + val : { + name : 'status', + op : 'eq', + val : params.attendees_status + } + } + ]; + } + } + if (params.filter) { + if (params.filter === 'discount') { + filterOptions.pushObject({ name : 'order', op : 'has', val : { - name : 'status', - op : 'eq', - val : params.attendees_status + name : 'discount_code_id', + op : 'isnot', + val : null } - } - ]; + }); + } else if (params.filter === 'date' && params.start_date && params.end_date) { + filterOptions.pushObject({ + name : 'order', + op : 'has', + val : { + name : 'created-at', + op : 'ge', + val : moment.tz(params.start_date, eventDetails.timezone).toISOString() + } + }); + filterOptions.pushObject({ + name : 'order', + op : 'has', + val : { + name : 'created-at', + op : 'le', + val : moment.tz(params.end_date, eventDetails.timezone).add(1, 'days').toISOString() + } + }); + } } filterOptions = this.applySearchFiltersExtend( filterOptions, @@ -78,6 +112,6 @@ export default class extends Route.extend(EmberTableRouteMixin) { queryString = this.applySortFilters(queryString, params); - return this.asArray(this.modelFor('events.view').query('attendees', queryString)); + return this.asArray(eventDetails.query('attendees', queryString)); } } diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index 9e3de3e5c9b..8c000fda05e 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -1,5 +1,6 @@ import Route from '@ember/routing/route'; import EmberTableRouteMixin from 'open-event-frontend/mixins/ember-table-route'; +import moment from 'moment-timezone'; export default class extends Route.extend(EmberTableRouteMixin) { titleToken() { @@ -18,8 +19,33 @@ export default class extends Route.extend(EmberTableRouteMixin) { } async model(params) { + const eventDetails = this.modelFor('events.view'); this.set('params', params); const filterOptions = []; + if (params.filter) { + if (params.filter === 'discount') { + filterOptions.pushObject({ + name : 'discount_code_id', + op : 'isnot', + val : null + }); + } else if (params.filter === 'date' && params.start_date && params.end_date) { + filterOptions.push({ + and: [ + { + name : 'created-at', + op : 'ge', + val : moment.tz(params.start_date, eventDetails.timezone).toISOString() + }, + { + name : 'created-at', + op : 'le', + val : moment.tz(params.end_date, eventDetails.timezone).add(1, 'days').toISOString() + } + ] + }); + } + } if (params.search) { filterOptions.pushObject({ name : 'user', @@ -48,6 +74,6 @@ export default class extends Route.extend(EmberTableRouteMixin) { queryString = this.applySortFilters(queryString, params); - return this.asArray(this.modelFor('events.view').query('orders', queryString)); + return this.asArray(eventDetails.query('orders', queryString)); } } diff --git a/app/styles/components/ticket-list.scss b/app/styles/components/ticket-list.scss index bcfb66ae3c9..ebbc2cd1352 100644 --- a/app/styles/components/ticket-list.scss +++ b/app/styles/components/ticket-list.scss @@ -10,3 +10,15 @@ vertical-align: baseline !important; } } + +.filter-date-mobile-session { + .end-date-session { + .ui.popup.calendar { + inset: 43px !important; + + table { + transform: translateX(-62%); + } + } + } +} diff --git a/app/styles/partials/utils.scss b/app/styles/partials/utils.scss index 9fb38e138d1..f30aab6e6a2 100644 --- a/app/styles/partials/utils.scss +++ b/app/styles/partials/utils.scss @@ -258,6 +258,10 @@ vertical-align: bottom; } +.b-0 { + border: 0 !important; +} + .add-to-calender-join-video { height: 36px; } diff --git a/app/templates/components/widgets/forms/date-picker.hbs b/app/templates/components/widgets/forms/date-picker.hbs index 7d6a4763c38..55a9e72a6e7 100644 --- a/app/templates/components/widgets/forms/date-picker.hbs +++ b/app/templates/components/widgets/forms/date-picker.hbs @@ -2,4 +2,4 @@ {{#if this.icon}} {{/if}} - + diff --git a/app/templates/events/view/tickets/attendees.hbs b/app/templates/events/view/tickets/attendees.hbs index 4b419c22c9c..6ff713a2355 100644 --- a/app/templates/events/view/tickets/attendees.hbs +++ b/app/templates/events/view/tickets/attendees.hbs @@ -25,20 +25,32 @@
-
- {{t 'Showing all the records'}} -
+ {{#if (eq this.router.currentRoute.queryParams.filter 'discount')}} +
+ + {{t 'Filter by Discount'}} +
+ {{else if (eq this.router.currentRoute.queryParams.filter 'date')}} +
+ + {{t 'Filter by Date'}} +
+ {{else}} +
+ {{t 'Showing all the records'}} +
+ {{/if}}
-
+
{{t 'Filter by Date'}}
-
+
{{t 'Filter by Discount'}}
-
+
{{t 'Remove Filters'}}
@@ -48,6 +60,72 @@
+ {{#if (eq this.router.currentRoute.queryParams.filter 'date')}} + {{#if this.device.isMobile}} +
+
+
+ +
+
+ + +
+
+
+ {{else}} +
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ {{/if}} + {{/if}}
diff --git a/app/templates/events/view/tickets/orders.hbs b/app/templates/events/view/tickets/orders.hbs index cafefd85dad..011cfc3e6d7 100644 --- a/app/templates/events/view/tickets/orders.hbs +++ b/app/templates/events/view/tickets/orders.hbs @@ -5,7 +5,7 @@ {{t 'View Orders'}}
-
+
@@ -25,20 +25,32 @@
-
- {{t 'Showing all the records'}} -
+ {{#if (eq this.router.currentRoute.queryParams.filter 'discount')}} +
+ + {{t 'Filter by Discount'}} +
+ {{else if (eq this.router.currentRoute.queryParams.filter 'date')}} +
+ + {{t 'Filter by Date'}} +
+ {{else}} +
+ {{t 'Showing all the records'}} +
+ {{/if}}
-
+
{{t 'Filter by Date'}}
-
+
{{t 'Filter by Discount'}}
-
+
{{t 'Remove Filters'}}
@@ -48,6 +60,72 @@
+{{#if (eq this.router.currentRoute.queryParams.filter 'date')}} + {{#if this.device.isMobile}} +
+
+
+ +
+
+ + +
+
+
+ {{else}} +
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ {{/if}} + {{/if}}
From 25ab4c1b0f9557ef974d958b2eb40f7889b0a2cb Mon Sep 17 00:00:00 2001 From: Khang On - TMA <135116292+khangon@users.noreply.github.com> Date: Thu, 24 Aug 2023 23:07:18 +0700 Subject: [PATCH 10/22] feature 9125: Fix top menu for mobile screens (#9143) * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens * feature-9125: Fix top menu for mobile screens --------- Co-authored-by: ntthitrinh --- app/components/nav-bar.js | 18 +++ app/styles/pages/public-event.scss | 10 +- app/styles/partials/nav-bar.scss | 188 +++++++++++++++++++++++++-- app/templates/components/nav-bar.hbs | 155 ++++++++++++---------- 4 files changed, 286 insertions(+), 85 deletions(-) diff --git a/app/components/nav-bar.js b/app/components/nav-bar.js index 5764d4d4a31..1a736fd2fd3 100644 --- a/app/components/nav-bar.js +++ b/app/components/nav-bar.js @@ -86,6 +86,23 @@ export default class NavBar extends Component { return !(String(this.session.currentRouteName).includes('events.view')); } + @computed('isNotPublicPageRoute') + get checkShowClassCssPublic() { + if (this.session.isAuthenticated) { + if (this.isNotPublicPageRoute) { + return 'au-home-page'; + } else { + return 'au-public-page'; + } + } else { + if (this.isNotPublicPageRoute) { + return 'un-home-page'; + } else { + return 'un-public-page'; + } + } + } + @action handleKeyPress() { if (event.keyCode === 13 || event.which === 13) { @@ -120,6 +137,7 @@ export default class NavBar extends Component { }); } + @action handleClick() { this.router.replaceWith('public.index', this.globalData.idEvent); diff --git a/app/styles/pages/public-event.scss b/app/styles/pages/public-event.scss index 401b384d6ea..6efd7731d1f 100644 --- a/app/styles/pages/public-event.scss +++ b/app/styles/pages/public-event.scss @@ -228,17 +228,11 @@ } .logo-event { - margin: 10px !important; - width: 56px !important; + // margin: 10px !important; + // width: 56px !important; height: auto; } -.btn-un-bd { - border: unset; - padding: unset !important; - height: 46px !important; -} - .public-social-links { margin-top: 1.5rem !important; } diff --git a/app/styles/partials/nav-bar.scss b/app/styles/partials/nav-bar.scss index bc21b62b97e..d56fe3ee1a8 100644 --- a/app/styles/partials/nav-bar.scss +++ b/app/styles/partials/nav-bar.scss @@ -34,9 +34,10 @@ } .menu-item-public { + height: 100%; padding-left: unset !important; padding-right: unset !important; - font-size: 12px; + font-size: 10px; } .item-exhibition { @@ -45,12 +46,8 @@ } } -.rm-pd-l { - width: 100% !important; -} - .item-public { - font-size: .85714286rem !important; + font-size: 9px !important; } .item-menu-right { @@ -62,6 +59,181 @@ } .item-padding { - padding-left: 8px !important; - padding-right: 8px !important; + padding-left: 16px !important; + padding-right: 16px !important; +} + +.header-mobile > .layout-header-mobile > .row > .two.wide.column.bl-six { + width: 14.5% !important; +} + +.layout-header-mobile { + + .row { + position: absolute; + } + + + .reset-pd { + padding: unset !important; + } + + .bl-one { + display: flex !important; + margin-right: -22px !important; + padding-left: 18px !important; + border-left: 1px solid rgba(34, 36, 38, .15) !important; + + .item-bl-one { + width: calc(100% - 44px); + } + } + + .bl-two { + margin-left: 9px !important; + border-left: 1px solid rgba(34, 36, 38, .15); + font-size: 14px; + + .item-bl-two-login { + border-right: 1px solid rgba(34, 36, 38, .15) !important; + height: 100%; + display: flex !important; + justify-content: center; + align-items: center; + } + + .btn-un-bd { + border: unset; + padding: unset !important; + height: 46px !important; + width: 100%; + margin: auto !important; + text-align: center; + display: flex; + justify-content: center; + align-items: center; + + img { + width: 80%; + } + } + } + + .bl-three { + display: flex !important; + text-align: center; + justify-content: center; + } + + .bl-three-border { + border-right: 1px solid rgba(34, 36, 38, .15); + } + + .bl-four { + display: flex !important; + text-align: center; + justify-content: center; + + .menu-speakers { + padding-left: 8px !important; + padding-right: 8px !important; + } + } + + .bl-six { + border-right: 1px solid rgba(34, 36, 38, .15); + + .au-public-page { + justify-content: center; + } + + .un-public-page { + display: flex; + justify-content: center; + align-items: center; + } + } + + .bl-six-border { + border-left: 1px solid rgba(34, 36, 38, .15); + } + + .bl-seven-au-public-page { + margin-right: auto !important; + margin-left: auto !important; + + .au-public-page-text { + text-align: center !important; + justify-content: center; + } + } + + .au-home-page-text { + justify-content: center; + } + + .bl-seven-au-home-page { + .text-home-page { + display: flex !important; + justify-content: center; + } + } + + .bl-seven { + left: 3px; + width: 18.5% !important; + margin: unset !important; + display: flex !important; + text-align: center; + justify-content: center; + align-items: center; + + a { + width: calc(100% - 4px); + background-color: #fff !important; + } + + .tag-a-not-login { + display: flex; + justify-content: center; + align-items: center; + padding: unset !important; + } + + .a-login-public { + display: flex; + justify-content: center; + align-items: center; + padding: unset !important; + } + } + + .bl-six-login { + button { + padding-left: 7px !important; + } + } + + .bl-seven-not-login { + margin-right: unset !important; + } + + .item { + &::before { + position: unset !important; + content: unset !important; + top: unset !important; + right: unset !important; + height: unset !important; + width: unset !important; + background: unset !important; + } + } +} + +.set-bd-home { + padding-left: 21px !important; + padding-top: unset !important; + padding-right: unset !important; + padding-bottom: unset !important; } diff --git a/app/templates/components/nav-bar.hbs b/app/templates/components/nav-bar.hbs index c7fe6383ea4..71a5fa51922 100644 --- a/app/templates/components/nav-bar.hbs +++ b/app/templates/components/nav-bar.hbs @@ -68,88 +68,105 @@
-
-
- - - - {{#if this.session.isAuthenticated}} - {{#if (and this.isNotPublicPageRoute this.isNotWizardPageRoute this.isNotEventPageRoute this.isNotOrderPageRoute this.isNotEventDetailPageRoute)}} - -
{{this.settings.appName}}
- - {{else }} - {{#if this.globalData.logoUrl}} - - {{else}} - - {{/if}} - {{/if}} - {{else}} - {{#if (and this.isNotPublicPageRoute this.isNotWizardPageRoute this.isNotEventPageRoute this.isNotOrderPageRoute this.isNotEventDetailPageRoute)}} + +
+
+
+ +
+ + + +
+
+ +
+
+ {{#if (not this.isNotPublicPageRoute)}} + {{#if this.showSessions}} +
Schedule
{{/if}} - {{/if}} - {{#if (not this.isNotPublicPageRoute)}} - {{#if this.showSessions}} -
Schedule
{{/if}} - {{#if this.showSpeakers}} -
Speakers
- {{/if}} - {{#if this.showExhibitors}} -
Exhibition
+
+
+ {{#if (not this.isNotPublicPageRoute)}} + {{#if this.showSpeakers}} +
Speakers
+ {{/if}} {{/if}} - {{/if}} - -
- {{!-- {{#if this.session.isAuthenticated}} --}} - {{!-- --}} - {{!-- {{/if}} --}} - {{#if (and this.isNotEventPageRoute this.isNotExplorePageRoute this.isNotWizardPageRoute)}} + + {{#if this.session.isAuthenticated}} +
+ {{#if (and this.isNotPublicPageRoute this.isNotWizardPageRoute this.isNotEventPageRoute this.isNotOrderPageRoute this.isNotEventDetailPageRoute)}} + +
+ {{t 'Create Event'}} +
+ + {{else}} + +
{{this.settings.appName}}
+ + {{/if}} +
{{else}} - {{t 'Login'}} +
+ +
{{/if}} -
+
From 92dafd63a6fc0130118cdf48b81dc695f21f8ba0 Mon Sep 17 00:00:00 2001 From: Khang On - TMA <135116292+khangon@users.noreply.github.com> Date: Fri, 25 Aug 2023 15:48:24 +0700 Subject: [PATCH 11/22] fix-9127:Top align table content on manage event dashboard (#9159) * fix-9127: Top align table content on manage event dashboard * fix-9127: Top align table content on manage event dashboard --- app/styles/pages/events.scss | 8 ++++++++ app/templates/components/tables/default.hbs | 2 +- app/templates/events/list.hbs | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/styles/pages/events.scss b/app/styles/pages/events.scss index 83678469fc1..0938388fa2c 100644 --- a/app/styles/pages/events.scss +++ b/app/styles/pages/events.scss @@ -256,3 +256,11 @@ min-width: 7rem; } } + +.table-event-live { + table { + td { + vertical-align: top !important; + } + } +} diff --git a/app/templates/components/tables/default.hbs b/app/templates/components/tables/default.hbs index b15cabbfcdb..e6d07639f63 100644 --- a/app/templates/components/tables/default.hbs +++ b/app/templates/components/tables/default.hbs @@ -14,7 +14,7 @@
{{/unless}}
-
+
\ No newline at end of file + @fillMode="equal-column" + @classEvent="table-event-live"/> \ No newline at end of file From 40db04f411fe8c11d4f1f9e420817db5b15e4e5c Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Sat, 26 Aug 2023 12:13:54 +0700 Subject: [PATCH 12/22] feature-8684: Add option to tag attendees (#9155) * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Add option to tag attendees * feature-8684: Merge code development --- app/components/forms/add-tag-form.hbs | 46 +++++++++++++ app/components/forms/add-tag-form.js | 69 +++++++++++++++++++ app/components/tables/headers/select-all.js | 12 ++++ app/components/tables/utilities/add-tag.js | 14 ++++ .../view/tickets/attendees/cell-select.js | 6 ++ .../events/view/tickets/attendees/cell-tag.js | 38 ++++++++++ app/controllers/events/view/tags.js | 6 ++ .../events/view/tickets/attendees/list.js | 67 ++++++++++++++++++ app/helpers/value-field-link.js | 4 +- app/models/attendee.js | 1 + app/models/event.js | 2 + app/models/tag.js | 16 +++++ app/router.js | 1 + app/routes/events/view/tags.js | 38 ++++++++++ .../events/view/tickets/attendees/list.js | 31 ++++++++- app/styles/partials/utils.scss | 18 +++++ app/templates/components/tables/default.hbs | 13 ++-- .../components/tables/headers/select-all.hbs | 6 ++ .../components/tables/utilities/add-tag.hbs | 13 ++++ .../components/tables/utilities/add-tags.hbs | 5 ++ .../view/tickets/attendees/cell-select.hbs | 5 ++ .../view/tickets/attendees/cell-tag.hbs | 6 ++ app/templates/events/view.hbs | 3 + app/templates/events/view/tags.hbs | 3 + .../events/view/tickets/attendees/list.hbs | 7 +- 25 files changed, 418 insertions(+), 12 deletions(-) create mode 100644 app/components/forms/add-tag-form.hbs create mode 100644 app/components/forms/add-tag-form.js create mode 100644 app/components/tables/headers/select-all.js create mode 100644 app/components/tables/utilities/add-tag.js create mode 100644 app/components/ui-table/cell/events/view/tickets/attendees/cell-select.js create mode 100644 app/components/ui-table/cell/events/view/tickets/attendees/cell-tag.js create mode 100644 app/controllers/events/view/tags.js create mode 100644 app/models/tag.js create mode 100644 app/routes/events/view/tags.js create mode 100644 app/templates/components/tables/headers/select-all.hbs create mode 100644 app/templates/components/tables/utilities/add-tag.hbs create mode 100644 app/templates/components/tables/utilities/add-tags.hbs create mode 100644 app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-select.hbs create mode 100644 app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-tag.hbs create mode 100644 app/templates/events/view/tags.hbs diff --git a/app/components/forms/add-tag-form.hbs b/app/components/forms/add-tag-form.hbs new file mode 100644 index 00000000000..2e8cbb7151e --- /dev/null +++ b/app/components/forms/add-tag-form.hbs @@ -0,0 +1,46 @@ +
+

+ {{t 'Tags'}} +

+
+
+
+ {{#each this.tagList as |tag index|}} +
+
+ +
+
+ + {{#unless tag.isReadOnly}} + + {{/unless}} + {{#if (eq index ( sub this.tagList.length 1 ) ) }} + + {{/if}} + +
+
+ +
+
+ {{/each}} +
+ +
+

{{t 'You need to hit "Submit" to save your changes.'}}

+
diff --git a/app/components/forms/add-tag-form.js b/app/components/forms/add-tag-form.js new file mode 100644 index 00000000000..33dd4058e50 --- /dev/null +++ b/app/components/forms/add-tag-form.js @@ -0,0 +1,69 @@ +import classic from 'ember-classic-decorator'; +import Component from '@ember/component'; +import { action, computed } from '@ember/object'; +import FormMixin from 'open-event-frontend/mixins/form'; +import { inject as service } from '@ember/service'; +import { tracked } from '@glimmer/tracking'; + +@classic +export default class AddTagForm extends Component.extend(FormMixin) { + @service errorHandler; + @tracked tagsDeleted = []; + + @computed('data.tags.@each.isDeleted', 'tagsDeleted.@each') + get tagList() { + return this.data.tags.filter(tag => !this.tagsDeleted.includes(tag)); + } + + willDestroyElement() { + const tagsNeedRemove = []; + this.data.tags.forEach(tag => { + if (!tag.id) { + tagsNeedRemove.pushObject(tag); + } else { + if (tag?.changedAttributes()) { + tag.rollbackAttributes(); + } + } + }); + if (tagsNeedRemove.length > 0) { + this.data.tags.removeObjects(tagsNeedRemove); + } + this._super(...arguments); + } + + @action + addItem() { + this.data.tags.pushObject(this.store.createRecord('tag')); + } + + @action + removeItem(tag) { + if (tag.id) { + this.tagsDeleted.pushObject(tag); + } else { + this.data.tags.removeObject(tag); + } + } + + @action + async submit() { + try { + this.data.tags.forEach(tag => { + if (this.tagsDeleted.includes(tag)) { + tag.deleteRecord(); + } + tag.save(); + }); + this.notify.success( + this.l10n.t('Your tag has been saved.'), + { id: 'tag_save' } + ); + } catch (error) { + this.notify.error( + this.l10n.t('Tag failed.'), + { id: 'tag_save' } + ); + } + } +} diff --git a/app/components/tables/headers/select-all.js b/app/components/tables/headers/select-all.js new file mode 100644 index 00000000000..0841af7c8b9 --- /dev/null +++ b/app/components/tables/headers/select-all.js @@ -0,0 +1,12 @@ +import classic from 'ember-classic-decorator'; +import Component from '@ember/component'; +import { action } from '@ember/object'; + +@classic +export default class SelectAll extends Component { + + @action + toggleSelectAll(value) { + this.column.actions.toggleSelectAll(value); + } +} diff --git a/app/components/tables/utilities/add-tag.js b/app/components/tables/utilities/add-tag.js new file mode 100644 index 00000000000..240d761b24c --- /dev/null +++ b/app/components/tables/utilities/add-tag.js @@ -0,0 +1,14 @@ +import classic from 'ember-classic-decorator'; +import Component from '@ember/component'; +import { action } from '@ember/object'; +import $ from 'jquery'; + +@classic +export default class AddTag extends Component { + + @action + onSelectTag(tag_id) { + $(this.element).find('input').trigger('blur'); + this.selectTag(tag_id); + } +} diff --git a/app/components/ui-table/cell/events/view/tickets/attendees/cell-select.js b/app/components/ui-table/cell/events/view/tickets/attendees/cell-select.js new file mode 100644 index 00000000000..6afefdeb1ce --- /dev/null +++ b/app/components/ui-table/cell/events/view/tickets/attendees/cell-select.js @@ -0,0 +1,6 @@ +import classic from 'ember-classic-decorator'; +import Component from '@ember/component'; + +@classic +export default class CellSelect extends Component { +} diff --git a/app/components/ui-table/cell/events/view/tickets/attendees/cell-tag.js b/app/components/ui-table/cell/events/view/tickets/attendees/cell-tag.js new file mode 100644 index 00000000000..8d7ed228219 --- /dev/null +++ b/app/components/ui-table/cell/events/view/tickets/attendees/cell-tag.js @@ -0,0 +1,38 @@ +import classic from 'ember-classic-decorator'; +import Component from '@ember/component'; +import { computed, action } from '@ember/object'; +import { htmlSafe } from '@ember/string'; + +@classic +export default class CellTag extends Component { + didInsertElement() { + this._super(...arguments); + } + + @action + removeTag() { + const attendee = this.props.row; + if (attendee) { + attendee.set('tagId', ''); + attendee.save(); + } + } + + @computed('record') + get attendeeTagName() { + const tag = this.props?.options?.tags?.find(tag => parseInt(tag.id) === this.record); + if (tag) { + return tag.name; + } + return ''; + } + + @computed('record') + get attendeeTagColor() { + const tag = this.props?.options?.tags?.find(tag => parseInt(tag.id) === this.record); + if (tag) { + return htmlSafe('background-color:' + tag.color + '; display: inline-flex'); + } + return ''; + } +} diff --git a/app/controllers/events/view/tags.js b/app/controllers/events/view/tags.js new file mode 100644 index 00000000000..6d058b8b658 --- /dev/null +++ b/app/controllers/events/view/tags.js @@ -0,0 +1,6 @@ +import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; + +export default class extends Controller { + @service errorHandler; +} diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js index 62de0dcbe82..b17ae99d34c 100644 --- a/app/controllers/events/view/tickets/attendees/list.js +++ b/app/controllers/events/view/tickets/attendees/list.js @@ -2,13 +2,32 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller'; import moment from 'moment-timezone'; +import { tracked } from '@glimmer/tracking'; export default class extends Controller.extend(EmberTableControllerMixin) { sort_by = 'order.completed_at'; sort_dir = 'DSC'; + + @tracked + selectAll = false + get columns() { return [ + { + name : '', + width : 50, + valuePath : 'selected', + cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-select', + headerComponent : 'tables/headers/select-all', + actions : { + toggleSelectAll: this.toggleSelectAll.bind(this) + }, + options: { + tags: this.model.tags + + } + }, { name : 'Order', width : 190, @@ -23,6 +42,24 @@ export default class extends Controller.extend(EmberTableControllerMixin) { headerComponent : 'tables/headers/sort', isSortable : true }, + { + name : 'Ticket Name', + width : 80, + valuePath : 'ticket.name', + headerComponent : 'tables/headers/sort', + isSortable : true + }, + { + name : 'Tags', + width : 100, + valuePath : 'tagId', + cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-tag', + headerComponent : 'tables/headers/sort', + isSortable : true, + options : { + tags: this.model.tags + } + }, { name : 'Date and Time', width : 120, @@ -69,6 +106,36 @@ export default class extends Controller.extend(EmberTableControllerMixin) { ]; } + @action + selectTag(tag) { + this.selectedTag = tag; + this.addTag(); + } + + @action + addTag() { + if (!this.selectedTag) {return} + this.model.attendees.data.forEach(attendee => { + + if (attendee.selected) { + attendee.set('tagId', parseInt(this.selectedTag)); + attendee.save(); + } + }); + this.toggleSelectAll(false); + this.selectedTag = null; + } + + @action + toggleSelectAll(selected) { + if (this.selectAll !== selected) { + this.selectAll = selected; + } + this.model.attendees.data.forEach(data => { + data.set('selected', selected); + }); + } + @action toggleCheckIn(attendee_id, date, isCheckedInCurrently) { const attendee = this.store.peekRecord('attendee', attendee_id, { backgroundReload: false }); diff --git a/app/helpers/value-field-link.js b/app/helpers/value-field-link.js index 556e77af9c5..b9efb5a80a4 100644 --- a/app/helpers/value-field-link.js +++ b/app/helpers/value-field-link.js @@ -3,8 +3,8 @@ import { htmlSafe } from '@ember/string'; export function valueFieldLink(data) { let field = ''; - if(data){ - field = data; + if (data) { + field = data; } return htmlSafe(field); } diff --git a/app/models/attendee.js b/app/models/attendee.js index 2ef641f84da..809fbd13147 100644 --- a/app/models/attendee.js +++ b/app/models/attendee.js @@ -50,6 +50,7 @@ export default ModelBase.extend({ is_consent_form_field_photo : attr('boolean', { defaultValue: false }), is_consent_form_field_email : attr('boolean', { defaultValue: false }), wiki_scholarship : attr('string'), + tagId : attr('number'), /** * Relationships diff --git a/app/models/event.js b/app/models/event.js index 3d60c507914..463ad973e6e 100644 --- a/app/models/event.js +++ b/app/models/event.js @@ -171,6 +171,8 @@ export default class Event extends ModelBase.extend(CustomPrimaryKeyMixin, { accessCodes: hasMany('access-code'), + tags: hasMany('tag'), + /** * Computed properties */ diff --git a/app/models/tag.js b/app/models/tag.js new file mode 100644 index 00000000000..a13f833b5cd --- /dev/null +++ b/app/models/tag.js @@ -0,0 +1,16 @@ +import attr from 'ember-data/attr'; +import ModelBase from 'open-event-frontend/models/base'; +import { belongsTo } from 'ember-data/relationships'; + +export default ModelBase.extend({ + /** + * Attributes + */ + name : attr('string'), + color : attr('string'), + isReadOnly : attr('boolean', { defaultValue: false }), + /** + * Relationships + */ + event : belongsTo('event') +}); diff --git a/app/router.js b/app/router.js index a25ddf0d552..8cd0aef67cd 100644 --- a/app/router.js +++ b/app/router.js @@ -148,6 +148,7 @@ Router.map(function() { this.route('edit', { path: '/:speaker_id/edit' }); }); this.route('documents'); + this.route('tags'); this.route('chat'); this.route('videoroom', { path: '/video' }, function() { this.route('list', { path: '/:status' }); diff --git a/app/routes/events/view/tags.js b/app/routes/events/view/tags.js new file mode 100644 index 00000000000..14f8a4f933e --- /dev/null +++ b/app/routes/events/view/tags.js @@ -0,0 +1,38 @@ +import Route from '@ember/routing/route'; + +export default class extends Route { + titleToken() { + return this.l10n.t('Tag'); + } + + addDefaultValue(tags) { + tags.addObject(this.store.createRecord('tag', { + name : 'Speakers', + color : '#FF0000', + isReadOnly : true + })); + tags.addObject(this.store.createRecord('tag', { + name : 'Attendees', + color : '#0000FF', + isReadOnly : true + })); + tags.addObject(this.store.createRecord('tag', { + name : 'VIPs', + color : '#0000FF', + isReadOnly : true + })); + tags.save(); + } + + async model() { + const event = this.modelFor('events.view'); + const tags = await event.query('tags', {}); + if (!tags || tags.length === 0) { + this.addDefaultValue(tags); + } + return { + event, + tags + }; + } +} diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js index a68b76254b6..986db7d680e 100644 --- a/app/routes/events/view/tickets/attendees/list.js +++ b/app/routes/events/view/tickets/attendees/list.js @@ -22,6 +22,25 @@ export default class extends Route.extend(EmberTableRouteMixin) { } } + addDefaultValue(tags) { + tags.addObject(this.store.createRecord('tag', { + name : 'Speakers', + color : '#FF0000', + isReadOnly : true + })); + tags.addObject(this.store.createRecord('tag', { + name : 'Attendees', + color : '#0000FF', + isReadOnly : true + })); + tags.addObject(this.store.createRecord('tag', { + name : 'VIPs', + color : '#0000FF', + isReadOnly : true + })); + tags.save(); + } + async model(params) { this.set('params', params); const eventDetails = this.modelFor('events.view'); @@ -109,9 +128,15 @@ export default class extends Route.extend(EmberTableRouteMixin) { 'page[number]' : params.page || 1 }; - queryString = this.applySortFilters(queryString, params); - - return this.asArray(eventDetails.query('attendees', queryString)); + const tags = await eventDetails.query('tags', {}); + if (!tags || tags.length === 0) { + this.addDefaultValue(tags); + } + const attendees = await this.asArray(await eventDetails.query('attendees', queryString)); + return { + tags, + attendees + }; } } diff --git a/app/styles/partials/utils.scss b/app/styles/partials/utils.scss index f30aab6e6a2..cef7d856e34 100644 --- a/app/styles/partials/utils.scss +++ b/app/styles/partials/utils.scss @@ -246,6 +246,24 @@ padding: 1rem !important; } +.fs-15 { + font-size: 15px !important; +} + +.tag-form { + .picker { + font-size: 16px !important; + } + + .remove-tag { + font-size: 19px !important; + } + + .add-tag { + font-size: 19px !important; + } +} + .z-index-0 { z-index: 0 !important; } diff --git a/app/templates/components/tables/default.hbs b/app/templates/components/tables/default.hbs index e6d07639f63..1aa82cc0cd6 100644 --- a/app/templates/components/tables/default.hbs +++ b/app/templates/components/tables/default.hbs @@ -6,13 +6,16 @@ @pageSize={{this.pageSize}} />
{{/unless}} - {{#unless @hideSearchBox}} -
+
+ {{#unless @hideSearchBox}} -
- {{/unless}} + {{/unless}} + {{#if @tags}} + + {{/if}} +
@@ -51,7 +54,7 @@ {{#component column.cellComponent record=(get row (t-var column.valuePath)) extraRecords=(get-properties row column.extraValuePaths) - props=(hash options=column.options actions=column.actions) + props=(hash options=column.options actions=column.actions row=row) }} {{cell}} {{/component}} diff --git a/app/templates/components/tables/headers/select-all.hbs b/app/templates/components/tables/headers/select-all.hbs new file mode 100644 index 00000000000..f7fbe9d0adc --- /dev/null +++ b/app/templates/components/tables/headers/select-all.hbs @@ -0,0 +1,6 @@ +
+ {{yield}} + +
diff --git a/app/templates/components/tables/utilities/add-tag.hbs b/app/templates/components/tables/utilities/add-tag.hbs new file mode 100644 index 00000000000..46d5d1c95ef --- /dev/null +++ b/app/templates/components/tables/utilities/add-tag.hbs @@ -0,0 +1,13 @@ + +
+ {{t 'Select Tag'}} +
+ +
+ {{#each this.tags as |tag|}} +
+ {{tag.name}} +
+ {{/each}} +
+ diff --git a/app/templates/components/tables/utilities/add-tags.hbs b/app/templates/components/tables/utilities/add-tags.hbs new file mode 100644 index 00000000000..80608605e71 --- /dev/null +++ b/app/templates/components/tables/utilities/add-tags.hbs @@ -0,0 +1,5 @@ +
+ +
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-select.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-select.hbs new file mode 100644 index 00000000000..2223cdd72ac --- /dev/null +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-select.hbs @@ -0,0 +1,5 @@ +
+ +
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-tag.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-tag.hbs new file mode 100644 index 00000000000..2cfd03e194b --- /dev/null +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-tag.hbs @@ -0,0 +1,6 @@ +{{#if this.record}} +
+
{{this.attendeeTagName}}
+ +
+{{/if}} diff --git a/app/templates/events/view.hbs b/app/templates/events/view.hbs index a35270e9c32..06308042ea3 100644 --- a/app/templates/events/view.hbs +++ b/app/templates/events/view.hbs @@ -52,6 +52,9 @@ {{t 'Team'}} + + {{t 'Tags'}} + {{#if (or this.authManager.currentUser.isAnAdmin (eq this.model.owner.email this.authManager.currentUser.email))}} {{t 'Settings'}} diff --git a/app/templates/events/view/tags.hbs b/app/templates/events/view/tags.hbs new file mode 100644 index 00000000000..edf155b6fce --- /dev/null +++ b/app/templates/events/view/tags.hbs @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/app/templates/events/view/tickets/attendees/list.hbs b/app/templates/events/view/tickets/attendees/list.hbs index 51266eb4efc..14e1e31ec93 100644 --- a/app/templates/events/view/tickets/attendees/list.hbs +++ b/app/templates/events/view/tickets/attendees/list.hbs @@ -1,13 +1,16 @@
Date: Sat, 26 Aug 2023 13:02:02 +0700 Subject: [PATCH 13/22] fix 9140: The value of the status dropdown list cannot be displayed in full (#9160) * fix-9140: The value of the status dropdown list cannot be displayed in full * fix-9140: The value of the status dropdown list cannot be displayed in full --- app/styles/pages/events.scss | 42 +++++++++++++++++++++ app/templates/events/view/sessions/list.hbs | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/styles/pages/events.scss b/app/styles/pages/events.scss index 0938388fa2c..cdf09a4276b 100644 --- a/app/styles/pages/events.scss +++ b/app/styles/pages/events.scss @@ -264,3 +264,45 @@ } } } + +.reset-overflow { + .z-index-0 { + div { + overflow: visible !important; + } + } +} + +.session-list .table tbody tr { + &:nth-last-child(2) { + .ui.dropdown.button { + position: relative; + } + + .menu { + position: absolute; + transform: translateY(-122%); + transition: transform .3s ease-in-out; + } + + .menu.hidden.transition { + position: relative; + } + } + + &:nth-last-child(3) { + .ui.dropdown.button { + position: relative; + } + + .menu { + position: absolute; + transform: translateY(-122%); + transition: transform .3s ease-in-out; + } + + .menu.hidden.transition { + position: relative; + } + } +} diff --git a/app/templates/events/view/sessions/list.hbs b/app/templates/events/view/sessions/list.hbs index f5e479581a3..1beaa0b5b1e 100644 --- a/app/templates/events/view/sessions/list.hbs +++ b/app/templates/events/view/sessions/list.hbs @@ -1,4 +1,4 @@ -
+
Date: Thu, 31 Aug 2023 12:49:40 +0700 Subject: [PATCH 14/22] feature-9082: Enhance language dropdown button (#9162) * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * fix css * fix UI * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * avoid using css inline * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * fix-9082 language dropdown not showing up * fix-9082 language dropdown not showing up * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button --------- Co-authored-by: nnhathung Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> Co-authored-by: ntthitrinh --- app/components/public/stream/video-stream.hbs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/components/public/stream/video-stream.hbs b/app/components/public/stream/video-stream.hbs index e660746ea06..49f83963140 100644 --- a/app/components/public/stream/video-stream.hbs +++ b/app/components/public/stream/video-stream.hbs @@ -12,13 +12,20 @@ {{/if}} {{#if (eq this.provider 'youtube')}} + {{#if this.selectingLanguage.selectingLanguage}} + + {{else}} + gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"> + {{/if}} {{/if}} {{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}} From 0cbe4fd9dd2bd74887b738ee71cb665e5b8c4a0b Mon Sep 17 00:00:00 2001 From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com> Date: Fri, 8 Sep 2023 15:35:12 +0700 Subject: [PATCH 15/22] feature-9082: Enhance language dropdown button (#9164) * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * fix css * fix UI * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * fix missing header * avoid using css inline * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * feature-9082: Fix css dropdown side panel * fix-9082 language dropdown not showing up * fix-9082 language dropdown not showing up * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button * feature-9082: Enhance language dropdown button --------- Co-authored-by: nnhathung Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com> Co-authored-by: ntthitrinh --- app/components/public/stream/video-stream.hbs | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/app/components/public/stream/video-stream.hbs b/app/components/public/stream/video-stream.hbs index 49f83963140..52d6cb64e1e 100644 --- a/app/components/public/stream/video-stream.hbs +++ b/app/components/public/stream/video-stream.hbs @@ -11,21 +11,23 @@ {{#if (eq @videoStream.videoChannel.provider 'jitsi')}} {{/if}} + {{#if this.selectingLanguage.selectingLanguage}} + + {{/if}} {{#if (eq this.provider 'youtube')}} - {{#if this.selectingLanguage.selectingLanguage}} - - {{else}} - - {{/if}} + {{/if}} {{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}} From d2861b965e0573d7652bab71d25102beb0bd2b4d Mon Sep 17 00:00:00 2001 From: nnhathung <139526485+nnhathung@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:16:34 +0700 Subject: [PATCH 16/22] feature-9065: Track when attendees login and join an event virtually in CSV (#9138) --- app/components/public/stream/join-video.ts | 13 +++++++++++++ app/components/public/stream/video-stream.ts | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/app/components/public/stream/join-video.ts b/app/components/public/stream/join-video.ts index cf57e04816c..bef2b557f39 100644 --- a/app/components/public/stream/join-video.ts +++ b/app/components/public/stream/join-video.ts @@ -26,6 +26,7 @@ export default class JoinVideo extends Component { openPanel(): void { if (this.args.canAccess) { this.args.showSidePanel?.(); + this.eventCheckIn(this.args.event.identifier) this.router.transitionTo({ queryParams: { side_panel: true } }); } else { if (this.session.isAuthenticated) { @@ -35,4 +36,16 @@ export default class JoinVideo extends Component { } } } + + async eventCheckIn(event_identifier: string) { + try { + const data:any = { + 'check_in_type' : 'event', + 'is_check_in' : true + }; + await this.loader.post(`events/${event_identifier}/virtual/check-in`, data); + } catch (e) { + // Ignore error to prevent stackoverflow + } + } } diff --git a/app/components/public/stream/video-stream.ts b/app/components/public/stream/video-stream.ts index 1975dfdafc2..aac9ec505bb 100644 --- a/app/components/public/stream/video-stream.ts +++ b/app/components/public/stream/video-stream.ts @@ -170,6 +170,7 @@ export default class PublicStreamVideoStream extends Component { this.selectingLanguage.setName(null); } this.selectingLanguage.setTranslationRoomId(stream.id) + this.eventCheckIn(this.args.event.identifier, stream.microlocationId) } @action @@ -177,4 +178,20 @@ export default class PublicStreamVideoStream extends Component { this.selectingLanguage.setStreamYardVisibility(false); } + async eventCheckIn(event_identifier: string, microlocation_id: number) { + try { + const data:any = { + 'check_in_type' : 'room', + microlocation_id, + 'is_check_in' : true + }; + if (microlocation_id === undefined) { + data.check_in_type = 'virtual-room' + } + await this.loader.post(`events/${event_identifier}/virtual/check-in`, data); + } catch (e) { + // Ignore error to prevent stackoverflow + } + } + } From ef639f6e938ea758c8b48e6aeb3b2f4e648836c0 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Tue, 12 Sep 2023 11:16:54 +0200 Subject: [PATCH 17/22] Translated using Weblate (Swedish) (#9163) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (2554 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ Co-authored-by: Kristoffer Grundström --- translations/sv.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/sv.po b/translations/sv.po index b6a806a327c..7e5c2590682 100644 --- a/translations/sv.po +++ b/translations/sv.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-08-17 17:53+0000\n" -"Last-Translator: Mario Behling \n" +"PO-Revision-Date: 2023-09-01 22:57+0000\n" +"Last-Translator: Kristoffer Grundström \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0-dev\n" +"X-Generator: Weblate 5.0.1-dev\n" "Generated-By: Babel 2.3.4\n" #: app/adapters/application.js:44:24 @@ -5700,7 +5700,7 @@ msgstr "Klicka här för att lägga till" #: app/templates/components/events/view/overview/general-info.hbs:64:20 msgid "No. of SupportersSupporters" -msgstr "" +msgstr "Antal supportrar" #: app/templates/components/events/view/overview/general-info.hbs:65:81 msgid "No Supporter added yet." @@ -6020,7 +6020,7 @@ msgstr "Uppladdat" #: app/templates/components/forms/admin/settings/analytics-form.hbs:3:4 msgid "Google Analytics" -msgstr "" +msgstr "Google Analytics" #: app/templates/components/forms/admin/settings/analytics-form.hbs:5:7 #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:15:8 From fa369457fc691f75a5aa955d7475234efa5ce5b6 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Thu, 12 Oct 2023 13:57:29 +0200 Subject: [PATCH 18/22] Translations update from Hosted Weblate (#9167) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translated using Weblate (Swedish) Currently translated at 100.0% (2554 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 99.9% (2552 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ * Translated using Weblate (Spanish) Currently translated at 100.0% (2554 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/ * Translated using Weblate (Polish) Currently translated at 100.0% (2554 of 2554 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/pl/ --------- Co-authored-by: Kristoffer Grundström Co-authored-by: gallegonovato Co-authored-by: Eryk Michalak --- translations/es.po | 12 +++++---- translations/pl.po | 15 ++++++----- translations/sv.po | 63 +++++++++++++++++++++++----------------------- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/translations/es.po b/translations/es.po index 0d8369be066..9c80a2d8530 100644 --- a/translations/es.po +++ b/translations/es.po @@ -1,19 +1,21 @@ # Hong Phuc Dang , 2023. # Mario Behling , 2023. +# gallegonovato , 2023. msgid "" msgstr "" "Project-Id-Version: open-event-frontend\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-07-09 20:10+0000\n" -"Last-Translator: Mario Behling \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2023-09-26 02:04+0000\n" +"Last-Translator: gallegonovato \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0-dev\n" +"X-Generator: Weblate 5.1-dev\n" "X-Crowdin-Project: open-event-frontend\n" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /development/translations/en.po\n" @@ -5694,7 +5696,7 @@ msgstr "Haga clic aquí para agregar" #: app/templates/components/events/view/overview/general-info.hbs:64:20 msgid "No. of SupportersSupporters" -msgstr "" +msgstr "Nº de partidarios" #: app/templates/components/events/view/overview/general-info.hbs:65:81 msgid "No Supporter added yet." diff --git a/translations/pl.po b/translations/pl.po index cba438b15df..4cdfec389dd 100644 --- a/translations/pl.po +++ b/translations/pl.po @@ -1,18 +1,21 @@ # Hong Phuc Dang , 2023. +# Eryk Michalak , 2023. msgid "" msgstr "" "Project-Id-Version: open-event-frontend\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-07-04 04:48+0000\n" -"Last-Translator: Anonymous \n" -"Language-Team: Polish \n" +"PO-Revision-Date: 2023-10-08 23:06+0000\n" +"Last-Translator: Eryk Michalak \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 5.0-dev\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 5.1-dev\n" "X-Crowdin-Project: open-event-frontend\n" "X-Crowdin-Language: pl\n" "X-Crowdin-File: /development/translations/en.po\n" @@ -5693,7 +5696,7 @@ msgstr "Kliknij tutaj, aby dodać" #: app/templates/components/events/view/overview/general-info.hbs:64:20 msgid "No. of SupportersSupporters" -msgstr "" +msgstr "Liczba wspierających" #: app/templates/components/events/view/overview/general-info.hbs:65:81 msgid "No Supporter added yet." diff --git a/translations/sv.po b/translations/sv.po index 7e5c2590682..2d543876455 100644 --- a/translations/sv.po +++ b/translations/sv.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-09-01 22:57+0000\n" +"PO-Revision-Date: 2023-09-20 07:02+0000\n" "Last-Translator: Kristoffer Grundström \n" "Language-Team: Swedish \n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0.1-dev\n" +"X-Generator: Weblate 5.1-dev\n" "Generated-By: Babel 2.3.4\n" #: app/adapters/application.js:44:24 @@ -220,7 +220,7 @@ msgstr "Inbjudan har skickats på nytt." #: app/controllers/groups/team.js:75:26 #: app/controllers/public/speaker-invite/view-session.js:37:26 msgid "Oops something went wrong. Please try again." -msgstr "Hoppsan, något gick fel. Vänligen försök igen" +msgstr "Hoppsan, något gick fel. Vänligen försök igen." #: app/components/events/view/overview/manage-roles.js:74:28 msgid "Role Invite deleted successfully." @@ -342,7 +342,7 @@ msgstr "Vänligen ange e-postadressen" #: app/components/forms/admin/settings/billing.js:44:23 msgid "Please enter the billing paypal email invoice money will be transferred to" -msgstr "Vänligen ange fakturering PayPal PayPal e -post faktura kommer att överföras till" +msgstr "" #: app/components/forms/admin/settings/billing.js:57:23 msgid "Please select the country" @@ -599,7 +599,7 @@ msgstr "Information om videokanal" #: app/templates/components/modals/add-system-role-modal.hbs:12:8 #: app/templates/components/orders/ticket-holder.hbs:12:8 msgid "Name" -msgstr "namn" +msgstr "Namn" #: app/components/forms/admin/video-channel-form.hbs:14:32 #: app/controllers/admin/video/channels/index.js:20:22 @@ -758,7 +758,7 @@ msgstr "Ange rabattprocenten" #: app/components/forms/events/view/create-discount-code.js:77:23 #: app/components/forms/events/view/create-discount-code.js:91:23 msgid "Please enter a valid integer" -msgstr "Var vänligen ange ett giltigt heltal." +msgstr "Vänligen ange ett giltigt heltal" #: app/components/forms/events/view/create-discount-code.js:108:23 msgid "Please select at least 1 ticket." @@ -870,7 +870,7 @@ msgstr "Lägg till anpassad länk" #: app/components/forms/group/group-settings-form.js:24:23 #: app/components/modals/tax-info-modal.js:26:23 msgid "Please enter a name." -msgstr "Vänligen ange ett namn" +msgstr "Vänligen ange ett namn." #: app/components/forms/events/view/exhibitors/exhibitor-form.ts:42:23 msgid "Please enter a URL." @@ -892,7 +892,7 @@ msgstr "Var god och skriv in en giltig url." #: app/components/forms/orders/order-form.js:481:23 #: app/components/forms/wizard/basic-details-step.js:364:23 msgid "Please enter a valid email address." -msgstr "Vänligen ange en giltig e-postadress" +msgstr "Vänligen ange en giltig e-postadress." #: app/components/forms/events/view/exhibitors/exhibitor-form.ts:67:23 msgid "Please enter a valid contact link." @@ -955,7 +955,7 @@ msgstr "Fältet för rumslösenord kan användas för att kommunicera ett lösen #: app/templates/components/modals/room-info-modal.hbs:3:2 #: app/templates/components/modals/room-info-modal.hbs:8:10 msgid "Additional Information" -msgstr "Extra information" +msgstr "Ytterligare information" #: app/components/forms/events/view/videoroom-form.hbs:90:19 #: app/controllers/events/view/videoroom/list.js:70:21 @@ -1027,7 +1027,7 @@ msgstr "Högtalare" #: app/templates/events/view/tickets.hbs:12:10 #: app/templates/public/session/view.hbs:14:27 msgid "Attendees" -msgstr "Attendees" +msgstr "Deltagande" #: app/components/forms/events/view/videoroom-form.hbs:170:69 msgid "All logged in users" @@ -1516,11 +1516,11 @@ msgstr "Ange ditt efternamn" #: app/components/forms/user-profile-form.js:52:23 msgid "Please enter a valid phone number" -msgstr "Vänligen ange ett giltigt telefonnummer." +msgstr "Vänligen ange ett giltigt telefonnummer" #: app/components/forms/user-profile-form.js:66:32 msgid "Your profile has been updated" -msgstr "Din profil har uppdaterats." +msgstr "Din profil har uppdaterats" #: app/components/forms/wizard/basic-details-step.js:25:22 msgid "Venue" @@ -1951,7 +1951,7 @@ msgstr "Golv" #: app/components/modals/add-room-modal.hbs:20:8 msgid "Hidden In Scheduler" -msgstr "Hidden In Scheduler" +msgstr "Dold i schemaläggaren" #: app/components/modals/add-room-modal.js:16:26 msgid "{{item}} has been created successfully" @@ -3313,7 +3313,7 @@ msgstr "Du kan dela länkarna i de här kolumnerna med deltagare i en händelse. #: app/controllers/events/view/videoroom/list.js:69:21 msgid "Additional information" -msgstr "Extra information" +msgstr "Ytterligare information" #: app/controllers/events/view/videoroom/list.js:74:24 msgid "Recordings" @@ -3425,7 +3425,7 @@ msgstr "Användare finns redan." #: app/controllers/register.js:34:35 msgid "Invalid email address." -msgstr "Ogiltig e-postadress" +msgstr "Ogiltig e-postadress." #: app/mixins/event-wizard.js:17:22 #: app/routes/events/view/edit/basic-details.js:8:11 @@ -3806,7 +3806,7 @@ msgstr "Utkast" #: app/templates/components/explore/side-bar.hbs:109:21 #: app/templates/events.hbs:13:10 msgid "Past" -msgstr "Past" +msgstr "Föregående" #: app/routes/admin/events/list.js:17:15 app/routes/admin/groups/list.js:11:15 #: app/routes/admin/users/list.js:13:15 app/templates/admin/groups.hbs:9:12 @@ -4854,7 +4854,7 @@ msgstr "(Inbyggd roll)" #: app/templates/admin/permissions/system-roles.hbs:36:10 #: app/templates/components/ui-table/cell/admin/users/cell-system-roles.hbs:4:6 msgid "Super Admin" -msgstr "Super Admin" +msgstr "Superadministratör" #: app/templates/admin/permissions/system-roles.hbs:58:96 #: app/templates/components/events/view/overview/manage-roles.hbs:69:47 @@ -5428,7 +5428,7 @@ msgstr "Belopp som ska betalas" #: app/templates/components/orders/ticket-holder.hbs:30:14 #: app/templates/components/orders/ticket-holder.hbs:50:33 msgid "Payment Mode" -msgstr "Betalnings sätt" +msgstr "Betalningsläge" #: app/templates/components/event-invoice/payee-info.hbs:35:20 #: app/templates/components/orders/ticket-holder.hbs:39:20 @@ -5455,7 +5455,7 @@ msgstr "Välj händelsekällfilen som ska importeras" #: app/templates/components/events/event-import-section.hbs:9:11 msgid "Supported formats:" -msgstr "Format som stöds" +msgstr "Format som stöds:" #: app/templates/components/events/event-import-section.hbs:10:8 msgid "Open Event compatible json package (.zip), PentabarfXML (.xml), iCalendar (.ical, .ics), XML Representation of iCalendar (.xcal)" @@ -5854,7 +5854,7 @@ msgstr "Börjar" #: app/templates/components/widgets/forms/ticket-input.hbs:151:56 #: app/templates/components/widgets/forms/ticket-input.hbs:353:58 msgid "Ends" -msgstr "Ends" +msgstr "Slutar" #: app/templates/components/explore/side-bar.hbs:122:8 msgid "Categories" @@ -6011,6 +6011,7 @@ msgid "Select Language" msgstr "Välj språk" #: app/templates/components/forms/admin/content/social-links-form.hbs:37:11 +#, fuzzy msgid "Google Group" msgstr "Google Group" @@ -6037,7 +6038,7 @@ msgstr "Google Analytics" #: app/templates/components/forms/admin/settings/system/storage-option.hbs:16:5 #: app/templates/components/forms/admin/settings/system/storage-option.hbs:47:5 msgid "See" -msgstr "See" +msgstr "Läs" #: app/templates/components/forms/admin/settings/analytics-form.hbs:7:8 #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:17:10 @@ -6254,7 +6255,7 @@ msgstr "Övre högra hörnet" #: app/templates/components/forms/admin/settings/microservices-form.hbs:3:4 msgid "Android App Generator" -msgstr "Android App Generator" +msgstr "App-generator för Android" #: app/templates/components/forms/admin/settings/microservices-form.hbs:7:6 #: app/templates/components/forms/admin/settings/microservices-form.hbs:19:6 @@ -6286,7 +6287,7 @@ msgstr "om hur man skaffar dessa nycklar." #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:23:6 msgid "Stripe Integration Mode" -msgstr "Stripe Integration Mode" +msgstr "Integreringsläge för Stripe" #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:27:15 #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:289:15 @@ -6414,7 +6415,7 @@ msgstr "Utelämna referenser" #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:285:6 msgid "Omise Integration Mode" -msgstr "Omise Integration Mode" +msgstr "Integreringsläge för Omise" #: app/templates/components/forms/admin/settings/payment-gateway-form.hbs:298:10 msgid "Omise Test Public Key" @@ -6562,11 +6563,11 @@ msgstr "Bildstorlek" #: app/templates/components/forms/admin/settings/system-form.hbs:103:4 msgid "Rocket Chat Integration" -msgstr "Rocket Chat Integration" +msgstr "Chatt-integration för Rocket" #: app/templates/components/forms/admin/settings/system-form.hbs:107:6 msgid "Rocket Chat URL" -msgstr "Rocket Chat URL" +msgstr "Chatt-URL för Rocket" #: app/templates/components/forms/admin/settings/system-form.hbs:116:6 msgid "Registration Secret" @@ -6690,7 +6691,7 @@ msgstr "Användarnamn" #: app/templates/components/forms/admin/settings/system/mail-settings.hbs:84:18 msgid "Sendgrid API" -msgstr "Sendgrid API" +msgstr "API för Sendgrid" #: app/templates/components/forms/admin/settings/system/mail-settings.hbs:90:4 msgid "on how to get this token." @@ -7221,7 +7222,7 @@ msgstr "Registrering med ett klick" #: app/templates/components/forms/register-form.hbs:32:135 msgid "Re-enter Password" -msgstr "Skriv in lösenord igen:" +msgstr "Skriv in lösenordet igen:" #: app/templates/components/forms/register-form.hbs:50:6 msgid "Already have an account? Login" @@ -9369,7 +9370,7 @@ msgstr "Betala på faktura" #: app/templates/orders/pending.hbs:130:25 msgid "Cheque" -msgstr "Kontrollera" +msgstr "Check" #: app/templates/orders/pending.hbs:146:25 msgid "Bank" @@ -11493,7 +11494,7 @@ msgstr "Erkännande" #: app/utils/dictionary/licenses.ts:36:15 msgid "All rights reserved" -msgstr "All rights reserved." +msgstr "Alla rättigheter är reserverade" #: app/utils/dictionary/licenses.ts:42:15 msgid "Attribution-NoDerivs" @@ -11633,7 +11634,7 @@ msgstr "Wikiquote" #: app/utils/dictionary/home-wikis.ts:14:10 msgid "Wikinews" -msgstr "Wikinews" +msgstr "Nyheter på wiki'n" #: app/utils/dictionary/home-wikis.ts:17:10 msgid "Wikisource" From 666021daa10f0834b1b2ee1a79d269a0e16be4fc Mon Sep 17 00:00:00 2001 From: Mohammed Saqlain Date: Mon, 11 Dec 2023 00:48:17 +0530 Subject: [PATCH 19/22] Update Twitter icon to X --- app/templates/components/footer-main.hbs | 4 +-- config/targets.js | 3 ++- package.json | 2 +- yarn.lock | 33 +++++++++++++++++++----- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index ded31d01d4f..01aa56dbc58 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -59,8 +59,8 @@ {{/if}} {{#if this.socialLinks.twitterUrl}} - - {{t 'Twitter'}} + + X {{/if}} {{#if this.socialLinks.githubUrl}} diff --git a/config/targets.js b/config/targets.js index b773273381a..4a43e744900 100644 --- a/config/targets.js +++ b/config/targets.js @@ -10,5 +10,6 @@ if (isCI || isProduction) { } module.exports = { - browsers + browsers, + node: 'current' }; diff --git a/package.json b/package.json index c1ae23637f4..c1fad1c22fe 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ember-cli-deprecation-workflow": "^2.1.0", "ember-cli-document-title-northm": "^1.0.3", "ember-cli-dotenv": "^3.1.0", - "ember-cli-fastboot": "^4.1.1", + "ember-cli-fastboot": "^4.1.2", "ember-cli-flash": "^2.2.0", "ember-cli-head": "^2.0.0", "ember-cli-html-minifier": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 0d99d0c2a82..77e6a86067b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7969,10 +7969,10 @@ ember-cli-dotenv@^3.1.0: ember-cli-babel "^7.1.2" minimist "^1.2.0" -ember-cli-fastboot@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-4.1.1.tgz#a16db66c7dce32c5450d7a4c34e3e96792c3ae31" - integrity sha512-9B/qJUfDVqRmZlXxP23V2AZ3hiez99DKT2cPJ0MWkjwRom/kmVJHvv5X4fxvT7MCokjOVFvzas79D5toV4GLIA== +ember-cli-fastboot@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-4.1.2.tgz#8ab783f07f71b2c963e8069a1379e58e3df36150" + integrity sha512-cC2ET8AbRTssA4sg9qF9KLX9N/Xnwa7kS0PKZADMMOUXtuBF4jmgnXsjzlvIE+lgWcwK4tc6udgwpMeNMkOg7w== dependencies: broccoli-concat "^4.2.5" broccoli-file-creator "^2.1.1" @@ -7984,8 +7984,8 @@ ember-cli-fastboot@^4.1.1: ember-cli-lodash-subset "^2.0.1" ember-cli-preprocess-registry "^3.3.0" ember-cli-version-checker "^5.1.2" - fastboot "4.1.1" - fastboot-express-middleware "4.1.1" + fastboot "4.1.2" + fastboot-express-middleware "4.1.2" fastboot-transform "^0.1.3" fs-extra "^10.0.0" json-stable-stringify "^1.0.1" @@ -10420,6 +10420,14 @@ fastboot-express-middleware@4.1.1: chalk "^4.1.2" fastboot "4.1.1" +fastboot-express-middleware@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-4.1.2.tgz#6a383c282fdc07ee3f90039701bb0dab11129179" + integrity sha512-vnzEBV7gZ3lSoGiqG/7+006nHNA3z+ZnU/5u9jPHtKpjH28yEbvZq6PnAeTu24UR98jZVR0pnFbfX0co+O9PeA== + dependencies: + chalk "^4.1.2" + fastboot "4.1.2" + fastboot-transform@^0.1.2, fastboot-transform@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd" @@ -10440,6 +10448,19 @@ fastboot@4.1.1: simple-dom "^1.4.0" source-map-support "^0.5.21" +fastboot@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-4.1.2.tgz#65627882d03962818f0f5331ca052d2da209ba98" + integrity sha512-VJLmF0xdCNwIIuA7DQtN1KTAKfEGsbZGJ0cfKh64h6DeMh3Fhr2FCCxkPh8zYqGoqzjXFdFbtk60WS3f6HKqBg== + dependencies: + chalk "^4.1.2" + cookie "^0.4.1" + debug "^4.3.3" + jsdom "^19.0.0" + resolve "^1.22.0" + simple-dom "^1.4.0" + source-map-support "^0.5.21" + fastq@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" From dfdeadf5f5f38d3e31b255dc3761059afea5d824 Mon Sep 17 00:00:00 2001 From: Mohammed Saqlain Date: Mon, 11 Dec 2023 00:55:00 +0530 Subject: [PATCH 20/22] Revert "Update Twitter icon to X" This reverts commit 666021daa10f0834b1b2ee1a79d269a0e16be4fc. --- app/templates/components/footer-main.hbs | 4 +-- config/targets.js | 3 +-- package.json | 2 +- yarn.lock | 33 +++++------------------- 4 files changed, 10 insertions(+), 32 deletions(-) diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index 01aa56dbc58..ded31d01d4f 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -59,8 +59,8 @@ {{/if}} {{#if this.socialLinks.twitterUrl}} - - X + + {{t 'Twitter'}} {{/if}} {{#if this.socialLinks.githubUrl}} diff --git a/config/targets.js b/config/targets.js index 4a43e744900..b773273381a 100644 --- a/config/targets.js +++ b/config/targets.js @@ -10,6 +10,5 @@ if (isCI || isProduction) { } module.exports = { - browsers, - node: 'current' + browsers }; diff --git a/package.json b/package.json index c1fad1c22fe..c1ae23637f4 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ember-cli-deprecation-workflow": "^2.1.0", "ember-cli-document-title-northm": "^1.0.3", "ember-cli-dotenv": "^3.1.0", - "ember-cli-fastboot": "^4.1.2", + "ember-cli-fastboot": "^4.1.1", "ember-cli-flash": "^2.2.0", "ember-cli-head": "^2.0.0", "ember-cli-html-minifier": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 77e6a86067b..0d99d0c2a82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7969,10 +7969,10 @@ ember-cli-dotenv@^3.1.0: ember-cli-babel "^7.1.2" minimist "^1.2.0" -ember-cli-fastboot@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-4.1.2.tgz#8ab783f07f71b2c963e8069a1379e58e3df36150" - integrity sha512-cC2ET8AbRTssA4sg9qF9KLX9N/Xnwa7kS0PKZADMMOUXtuBF4jmgnXsjzlvIE+lgWcwK4tc6udgwpMeNMkOg7w== +ember-cli-fastboot@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-4.1.1.tgz#a16db66c7dce32c5450d7a4c34e3e96792c3ae31" + integrity sha512-9B/qJUfDVqRmZlXxP23V2AZ3hiez99DKT2cPJ0MWkjwRom/kmVJHvv5X4fxvT7MCokjOVFvzas79D5toV4GLIA== dependencies: broccoli-concat "^4.2.5" broccoli-file-creator "^2.1.1" @@ -7984,8 +7984,8 @@ ember-cli-fastboot@^4.1.2: ember-cli-lodash-subset "^2.0.1" ember-cli-preprocess-registry "^3.3.0" ember-cli-version-checker "^5.1.2" - fastboot "4.1.2" - fastboot-express-middleware "4.1.2" + fastboot "4.1.1" + fastboot-express-middleware "4.1.1" fastboot-transform "^0.1.3" fs-extra "^10.0.0" json-stable-stringify "^1.0.1" @@ -10420,14 +10420,6 @@ fastboot-express-middleware@4.1.1: chalk "^4.1.2" fastboot "4.1.1" -fastboot-express-middleware@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-4.1.2.tgz#6a383c282fdc07ee3f90039701bb0dab11129179" - integrity sha512-vnzEBV7gZ3lSoGiqG/7+006nHNA3z+ZnU/5u9jPHtKpjH28yEbvZq6PnAeTu24UR98jZVR0pnFbfX0co+O9PeA== - dependencies: - chalk "^4.1.2" - fastboot "4.1.2" - fastboot-transform@^0.1.2, fastboot-transform@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd" @@ -10448,19 +10440,6 @@ fastboot@4.1.1: simple-dom "^1.4.0" source-map-support "^0.5.21" -fastboot@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-4.1.2.tgz#65627882d03962818f0f5331ca052d2da209ba98" - integrity sha512-VJLmF0xdCNwIIuA7DQtN1KTAKfEGsbZGJ0cfKh64h6DeMh3Fhr2FCCxkPh8zYqGoqzjXFdFbtk60WS3f6HKqBg== - dependencies: - chalk "^4.1.2" - cookie "^0.4.1" - debug "^4.3.3" - jsdom "^19.0.0" - resolve "^1.22.0" - simple-dom "^1.4.0" - source-map-support "^0.5.21" - fastq@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" From 90f23e905da8cab12f30ec61b3ce42dde3a9d62f Mon Sep 17 00:00:00 2001 From: Mohammed Saqlain Date: Mon, 11 Dec 2023 23:57:53 +0530 Subject: [PATCH 21/22] Update Twitter icon to X --- app/templates/components/footer-main.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index ded31d01d4f..97c522ce86e 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -59,8 +59,8 @@ {{/if}} {{#if this.socialLinks.twitterUrl}} - - {{t 'Twitter'}} + + X {{/if}} {{#if this.socialLinks.githubUrl}} From c9235983f4feb2b3541b4b0cd817c1ef8e0ca7aa Mon Sep 17 00:00:00 2001 From: Mohammed Saqlain Date: Thu, 14 Dec 2023 13:52:30 +0530 Subject: [PATCH 22/22] Address feedback: fetch from config, scale correction --- app/templates/components/footer-main.hbs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index 97c522ce86e..dd1e199f185 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -59,10 +59,19 @@ {{/if}} {{#if this.socialLinks.twitterUrl}} - - X + + + + {{t 'X'}} {{/if}} + {{#if this.socialLinks.githubUrl}} {{t 'GitHub'}}