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/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/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/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/components/public/stream/video-stream.hbs b/app/components/public/stream/video-stream.hbs index c210fab2da5..52d6cb64e1e 100644 --- a/app/components/public/stream/video-stream.hbs +++ b/app/components/public/stream/video-stream.hbs @@ -8,19 +8,25 @@ -{{/if}} - {{#if (eq @videoStream.videoChannel.provider 'jitsi')}} {{/if}} + {{#if this.selectingLanguage.selectingLanguage}} + + {{/if}} {{#if (eq this.provider 'youtube')}} - {{/if}} {{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}} 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 + } + } + } 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.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/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/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/helpers/value-field-link.js b/app/helpers/value-field-link.js new file mode 100644 index 00000000000..b9efb5a80a4 --- /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/mixins/ember-table-route.js b/app/mixins/ember-table-route.js index d93fff10ccc..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 }, @@ -19,6 +28,7 @@ export default Mixin.create({ refreshModel: true } }, + per_page: 10, applySearchFilters(options, params, searchFields) { if (!Array.isArray(searchFields)) { @@ -109,8 +119,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], 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/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[]; 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 dd406ca3df5..986db7d680e 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() { @@ -21,8 +22,28 @@ 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'); let filterOptions = []; if (params.attendees_status === 'checkedIn') { filterOptions = [ @@ -40,20 +61,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, @@ -71,13 +124,19 @@ 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 }; - queryString = this.applySortFilters(queryString, params); - - return this.asArray(this.modelFor('events.view').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/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/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') } }); + } } } 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/pages/events.scss b/app/styles/pages/events.scss index 83678469fc1..cdf09a4276b 100644 --- a/app/styles/pages/events.scss +++ b/app/styles/pages/events.scss @@ -256,3 +256,53 @@ min-width: 7rem; } } + +.table-event-live { + table { + td { + vertical-align: top !important; + } + } +} + +.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/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/styles/partials/utils.scss b/app/styles/partials/utils.scss index e017160f0e2..cef7d856e34 100644 --- a/app/styles/partials/utils.scss +++ b/app/styles/partials/utils.scss @@ -246,6 +246,28 @@ 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; +} + .mt-0 { margin-top: 0 !important; } @@ -254,6 +276,10 @@ vertical-align: bottom; } +.b-0 { + border: 0 !important; +} + .add-to-calender-join-video { height: 36px; } 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}} 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}} -
+
diff --git a/app/templates/components/tables/default.hbs b/app/templates/components/tables/default.hbs index eaa3d1eec7b..1aa82cc0cd6 100644 --- a/app/templates/components/tables/default.hbs +++ b/app/templates/components/tables/default.hbs @@ -6,15 +6,18 @@ @pageSize={{this.pageSize}} />
{{/unless}} - {{#unless @hideSearchBox}} -
+
+ {{#unless @hideSearchBox}} -
- {{/unless}} + {{/unless}} + {{#if @tags}} + + {{/if}} +
-
+
+ {{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/tables/utilities/page-size-input.hbs b/app/templates/components/tables/utilities/page-size-input.hbs index bfe56330a85..b364738a469 100644 --- a/app/templates/components/tables/utilities/page-size-input.hbs +++ b/app/templates/components/tables/utilities/page-size-input.hbs @@ -1,7 +1,7 @@ {{t 'Show'}} -
{{this.pageSize}}
+
{{if (eq this.pageSize 0) 'All' this.pageSize}}
{{#each this.sizes as |size|}} 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/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/list.hbs b/app/templates/events/list.hbs index 8de21e16742..9c633456344 100644 --- a/app/templates/events/list.hbs +++ b/app/templates/events/list.hbs @@ -10,4 +10,5 @@ @filterOptions={{this.filterOptions}} @widthConstraint="eq-container" @resizeMode="fluid" - @fillMode="equal-column" /> \ No newline at end of file + @fillMode="equal-column" + @classEvent="table-event-live"/> \ No newline at end of file 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/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 @@ -
+
+ +
\ No newline at end of file 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'}} 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/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 @@
-
+
@@ -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/translations/sv.po b/translations/sv.po index 5cdcc7c7ccd..7e5c2590682 100644 --- a/translations/sv.po +++ b/translations/sv.po @@ -6,20 +6,22 @@ # 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-09-01 22:57+0000\n" +"Last-Translator: Kristoffer Grundström \n" +"Language-Team: Swedish \n" "Language: sv\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.0.1-dev\n" "Generated-By: Babel 2.3.4\n" #: app/adapters/application.js:44:24 @@ -5698,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." @@ -6018,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 @@ -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" diff --git a/yarn.lock b/yarn.lock index 0d99d0c2a82..444125ee4cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14244,10 +14244,10 @@ nan@^2.12.1, nan@^2.13.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== -nanoid@^3.1.23, nanoid@^3.1.30: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== +nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== nanomatch@^1.2.9: version "1.2.9" @@ -15323,23 +15323,14 @@ postcss-value-parser@^4.1.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^8.2.15: - version "8.2.15" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" - integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== +postcss@^8.2.15, postcss@^8.3.11: + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: - colorette "^1.2.2" - nanoid "^3.1.23" - source-map "^0.6.1" - -postcss@^8.3.11: - version "8.3.11" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" - integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== - dependencies: - nanoid "^3.1.30" + nanoid "^3.3.6" picocolors "^1.0.0" - source-map-js "^0.6.2" + source-map-js "^1.0.2" pre-commit@^1.2.2: version "1.2.2" @@ -16993,16 +16984,11 @@ source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-js@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== - source-map-resolve@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"