Skip to content

chore: Convert event templates to angle bracket syntax #4321

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = {
},
overrides: [
{
files: ['**/app/templates/account/**/*.hbs'],
files: ['**/app/templates/account/**/*.hbs', '**/app/templates/events/**/*.hbs'],
rules: {
'no-curly-component-invocation': true,
}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/events/import.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{events/event-import-section uploadFile=(action 'uploadFile') importStatus=importStatus importError=importError isImporting=isImporting file=file}}
<Events::EventImportSection @uploadFile={{action "uploadFile"}} @importStatus={{importStatus}} @importError={{importError}} @isImporting={{isImporting}} @file={{file}} />
<div class="ui hidden divider"></div>
{{events/imports-history-section data=model.importJobs columns=columns page=page per_page=per_page search=search sort_by=sort_by sort_dir=sort_dir filterOptions=filterOptions}}
<Events::ImportsHistorySection @data={{model.importJobs}} @columns={{columns}} @page={{page}} @per_page={{per_page}} @search={{search}} @sort_by={{sort_by}} @sort_dir={{sort_dir}} @filterOptions={{filterOptions}} />
34 changes: 17 additions & 17 deletions app/templates/events/view.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="ui grid stackable">
<div class="row">
<div class="sixteen wide column">
{{unverified-user-message}}
<UnverifiedUserMessage />
</div>
</div>
</div>
Expand Down Expand Up @@ -57,31 +57,31 @@

<div class="row" style="padding-top: 15px">
<div class="sixteen wide column">
{{#tabbed-navigation}}
{{#link-to 'events.view.index' class='item'}}
<TabbedNavigation>
<LinkTo @route="events.view.index" class="item">
{{t 'Overview'}}
{{/link-to}}
{{#link-to 'events.view.tickets' class='item'}}
</LinkTo>
<LinkTo @route="events.view.tickets" class="item">
{{t 'Tickets'}}
{{/link-to}}
{{#link-to 'events.view.scheduler' class='item'}}
</LinkTo>
<LinkTo @route="events.view.scheduler" class="item">
{{t 'Scheduler'}}
{{/link-to}}
{{#link-to 'events.view.sessions' class='item'}}
</LinkTo>
<LinkTo @route="events.view.sessions" class="item">
{{t 'Sessions'}}
{{/link-to}}
{{#link-to 'events.view.speakers' class='item'}}
</LinkTo>
<LinkTo @route="events.view.speakers" class="item">
{{t 'Speakers'}}
{{/link-to}}
{{#link-to 'events.view.export' class='item'}}
</LinkTo>
<LinkTo @route="events.view.export" class="item">
{{t 'Export'}}
{{/link-to}}
</LinkTo>
{{#if (or authManager.currentUser.isAnAdmin (eq model.owner.email authManager.currentUser.email))}}
{{#link-to 'events.view.settings' class='item'}}
<LinkTo @route="events.view.settings" class="item">
{{t 'Settings'}}
{{/link-to}}
</LinkTo>
{{/if}}
{{/tabbed-navigation}}
</TabbedNavigation>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/events/view/edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h2 class="weight-300">{{t 'Editing'}} {{model.event.name}}</h2>
<div class="ui one column centered stacked grid event wizard">
<div class="column mobile hidden">
{{widgets/steps-indicator steps=model.steps autoSteps=true enableAll=true}}
<Widgets::StepsIndicator @steps={{model.steps}} @autoSteps={{true}} @enableAll={{true}} />
</div>
<div class="column">
{{outlet}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/events/view/edit/attendee.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{forms/wizard/attendee-step data=model move='move' save='save' isLoading=isLoading}}
<Forms::Wizard::AttendeeStep @data={{model}} @move="move" @save="save" @isLoading={{isLoading}} />
2 changes: 1 addition & 1 deletion app/templates/events/view/edit/basic-details.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{forms/wizard/basic-details-step data=model move='move' save='save' isLoading=isLoading}}
<Forms::Wizard::BasicDetailsStep @data={{model}} @move="move" @save="save" @isLoading={{isLoading}} />
2 changes: 1 addition & 1 deletion app/templates/events/view/edit/sessions-speakers.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{forms/wizard/sessions-speakers-step data=model move='move' save='save' isLoading=isLoading}}
<Forms::Wizard::SessionsSpeakersStep @data={{model}} @move="move" @save="save" @isLoading={{isLoading}} />
2 changes: 1 addition & 1 deletion app/templates/events/view/edit/sponsors.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{forms/wizard/sponsors-step data=model move='move' save='save' isLoading=isLoading}}
<Forms::Wizard::SponsorsStep @data={{model}} @move="move" @save="save" @isLoading={{isLoading}} />
10 changes: 5 additions & 5 deletions app/templates/events/view/export.hbs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="ui stackable very relaxed container grid">
<div class="eight wide column">
{{events/view/export/download-zip startGeneration=(action 'startGeneration') isDownloadDisabled=isDownloadDisabled eventExportStatus=eventExportStatus eventDownloadUrl=eventDownloadUrl data=data isLoading=isLoading}}
<Events::View::Export::DownloadZip @startGeneration={{action "startGeneration"}} @isDownloadDisabled={{isDownloadDisabled}} @eventExportStatus={{eventExportStatus}} @eventDownloadUrl={{eventDownloadUrl}} @data={{data}} @isLoading={{isLoading}} />
<div class="ui divider"></div>
{{events/view/export/download-common downloadType='Pentabarf XML' downloadUrl='pentabarf.xml' model=model}}
<Events::View::Export::DownloadCommon @downloadType="Pentabarf XML" @downloadUrl="pentabarf.xml" @model={{model}} />
<div class="ui divider"></div>
{{events/view/export/download-common downloadType='iCalendar' downloadUrl='calendar.ics' model=model}}
<Events::View::Export::DownloadCommon @downloadType="iCalendar" @downloadUrl="calendar.ics" @model={{model}} />
<div class="ui divider"></div>
{{events/view/export/download-common downloadType='iCalendar XML (xCal)' downloadUrl='calendar.xcs' model=model}}
<Events::View::Export::DownloadCommon @downloadType="iCalendar XML (xCal)" @downloadUrl="calendar.xcs" @model={{model}} />
</div>
<div class="eight wide column">
{{events/view/export/api-response eventId=model.id}}
<Events::View::Export::ApiResponse @eventId={{model.id}} />
</div>
</div>
12 changes: 6 additions & 6 deletions app/templates/events/view/index.hbs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<div class="ui grid stackable">
<div class="eight wide column">
{{events/view/overview/event-setup-checklist data=model}}
<Events::View::Overview::EventSetupChecklist @data={{model}} />
</div>
<div class="eight wide column">
{{events/view/overview/general-info data=model}}
<Events::View::Overview::GeneralInfo @data={{model}} />
</div>
<div class="eight wide column">
{{events/view/overview/manage-roles data=model}}
<Events::View::Overview::ManageRoles @data={{model}} />
</div>
<div class="eight wide column">
{{events/view/overview/event-sponsors data=model.sponsors columns=columns page=page per_page=per_page search=search sort_by=sort_by sort_dir=sort_dir filterOptions=filterOptions}}
<Events::View::Overview::EventSponsors @data={{model.sponsors}} @columns={{columns}} @page={{page}} @per_page={{per_page}} @search={{search}} @sort_by={{sort_by}} @sort_dir={{sort_dir}} @filterOptions={{filterOptions}} />
</div>
<div class="eight wide column">
{{events/view/overview/event-apps}}
<Events::View::Overview::EventApps />
</div>
<div class="eight wide column">
{{events/view/overview/event-tickets data=model}}
<Events::View::Overview::EventTickets @data={{model}} />
</div>
</div>
50 changes: 25 additions & 25 deletions app/templates/events/view/scheduler.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="ui raised segments">
{{#each model.unscheduled as |session|}}
{{#if (or (eq session.state 'accepted') (eq session.state 'confirmed'))}}
{{scheduler/unscheduled-session session=session}}
<Scheduler::UnscheduledSession @session={{session}} />
{{/if}}
{{/each}}
</div>
Expand All @@ -19,30 +19,30 @@
{{#if device.isMobile}}
<div class="ui hidden divider"></div>
{{/if}}
{{full-calendar events=model.events
aspectRatio=(if device.isMobile 0.7 1.8)
editable=true
timezone=model.timezone
droppable=true
resources=model.resources
groupByResource=true
resourceLabelText= 'Rooms'
header=model.header
ondragover="{{action 'allowDrop' event}}"
views=model.views
viewName='agendaDay'
drop=(action 'drop')
eventResize=(action 'eventResize')
eventDrop=(action 'eventDrop')
eventRender=(action 'eventRender')
defaultView='timelineDay'
validRange=model.validRange
now=(moment-format (now) 'YYYY-MM-DD')
scrollTime= '00:00'
minTime=model.minTime
slotDuration='00:10:00'
slotLabelFormat='HH:mm'
}}
<FullCalendar
@events={{model.events}}
@aspectRatio={{if device.isMobile 0.7 1.8}}
@editable={{true}}
@timezone={{model.timezone}}
@droppable={{true}}
@resources={{model.resources}}
@groupByResource={{true}}
@resourceLabelText="Rooms"
@header={{model.header}}
@ondragover="{{action 'allowDrop' event}}"
@views={{model.views}}
@viewName="agendaDay"
@drop={{action "drop"}}
@eventResize={{action "eventResize"}}
@eventDrop={{action "eventDrop"}}
@eventRender={{action "eventRender"}}
@defaultView="timelineDay"
@validRange={{model.validRange}}
@now={{moment-format (now ) "YYYY-MM-DD"}}
@scrollTime="00:00"
@minTime={{model.minTime}}
@slotDuration="00:10:00"
@slotLabelFormat="HH:mm" />
</div>
</div>
</div>
28 changes: 14 additions & 14 deletions app/templates/events/view/sessions.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
{{#if onSessionRoute}}
<div class="row">
<div class="eight wide column">
{{#tabbed-navigation isNonPointing=true}}
{{#link-to 'events.view.sessions.list' 'all' class='item'}}
<TabbedNavigation @isNonPointing={{true}}>
<LinkTo @route="events.view.sessions.list" @model="all" class="item">
{{t 'All'}}
{{/link-to}}
{{#link-to 'events.view.sessions.list' 'pending' class='item'}}
</LinkTo>
<LinkTo @route="events.view.sessions.list" @model="pending" class="item">
{{t 'Pending'}}
{{/link-to}}
{{#link-to 'events.view.sessions.list' 'accepted' class='item'}}
</LinkTo>
<LinkTo @route="events.view.sessions.list" @model="accepted" class="item">
{{t 'Accepted'}}
{{/link-to}}
{{#link-to 'events.view.sessions.list' 'confirmed' class='item'}}
</LinkTo>
<LinkTo @route="events.view.sessions.list" @model="confirmed" class="item">
{{t 'Confirmed'}}
{{/link-to}}
{{#link-to 'events.view.sessions.list' 'rejected' class='item'}}
</LinkTo>
<LinkTo @route="events.view.sessions.list" @model="rejected" class="item">
{{t 'Rejected'}}
{{/link-to}}
{{/tabbed-navigation}}
</LinkTo>
</TabbedNavigation>
</div>
<div class="eight wide right aligned column">
<div class="ui labeled input">
<button class="ui blue button right-floated {{if isLoading 'loading'}}" {{action 'export'}}>{{t 'Export as CSV'}}</button>
{{#link-to 'events.view.sessions.create' class='ui blue button right floated'}}
<LinkTo @route="events.view.sessions.create" class="ui blue button right floated">
{{t 'Create Session'}}
{{/link-to}}
</LinkTo>
</div>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions app/templates/events/view/sessions/create.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
{{t 'Create Session'}}
</h2>
<div class="ui container">
{{forms/session-speaker-form addNewSpeaker=addNewSpeaker
fields=model.form
data=model
speakers=model.speakers
event=model.event
speakersDetails=model.session.speakers
save=(action 'save')
includeSession=true
isSessionSpeaker=true
isLoading=isLoading
}}
<Forms::SessionSpeakerForm
@addNewSpeaker={{addNewSpeaker}}
@fields={{model.form}}
@data={{model}}
@speakers={{model.speakers}}
@event={{model.event}}
@speakersDetails={{model.session.speakers}}
@save={{action "save"}}
@includeSession={{true}}
@isSessionSpeaker={{true}}
@isLoading={{isLoading}} />
</div>
</div>
26 changes: 13 additions & 13 deletions app/templates/events/view/sessions/edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
{{t 'Edit Session'}}
</h2>
<div class="ui container">
{{forms/session-speaker-form addNewSpeaker=addNewSpeaker
speakers=model.speakers
fields=model.form
data=model
event=model.event
save=(action 'save')
isSession=true
speakersDetails=model.session.speakers
includeSession=true
isSessionSpeaker=true
isLoading=isLoading
isEditForm=true
}}
<Forms::SessionSpeakerForm
@addNewSpeaker={{addNewSpeaker}}
@speakers={{model.speakers}}
@fields={{model.form}}
@data={{model}}
@event={{model.event}}
@save={{action "save"}}
@isSession={{true}}
@speakersDetails={{model.session.speakers}}
@includeSession={{true}}
@isSessionSpeaker={{true}}
@isLoading={{isLoading}}
@isEditForm={{true}} />
</div>
</div>
</div>
24 changes: 18 additions & 6 deletions app/templates/events/view/settings.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,21 @@
</div>
</div>
</div>
{{modals/event-transfer-modal isLoading=isLoading isOpen=isEventTransferModalOpen confirmEventName=confirmEventName eventName=eventName openConfirmEventTransferModal=(action 'openConfirmEventTransferModal') transferEvent=(action 'transferEvent' model)}}
{{modals/confirm-event-transfer-modal currentInvite=currentInvite isLoading=isLoading isOpen=isConfirmEventTransferModalOpen checked=checked transferEvent=(action 'transferEvent')}}
{{modals/event-delete-modal isLoading=isLoading
isOpen=isEventDeleteModalOpen
eventName=model.event.name
deleteEvent=(action 'deleteEvent')}}
<Modals::EventTransferModal
@isLoading={{isLoading}}
@isOpen={{isEventTransferModalOpen}}
@confirmEventName={{confirmEventName}}
@eventName={{eventName}}
@openConfirmEventTransferModal={{action "openConfirmEventTransferModal"}}
@transferEvent={{action "transferEvent" model}} />
<Modals::ConfirmEventTransferModal
@currentInvite={{currentInvite}}
@isLoading={{isLoading}}
@isOpen={{isConfirmEventTransferModalOpen}}
@checked={{checked}}
@transferEvent={{action "transferEvent"}} />
<Modals::EventDeleteModal
@isLoading={{isLoading}}
@isOpen={{isEventDeleteModalOpen}}
@eventName={{model.event.name}}
@deleteEvent={{action "deleteEvent"}} />
28 changes: 14 additions & 14 deletions app/templates/events/view/speakers.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
{{#if (and (not-eq session.currentRouteName 'events.view.speakers.edit') (not-eq session.currentRouteName 'events.view.speakers.create'))}}
<div class="row">
<div class="six wide column">
{{#tabbed-navigation isNonPointing=true}}
{{#link-to 'events.view.speakers.list' 'all' class='item'}}
<TabbedNavigation @isNonPointing={{true}}>
<LinkTo @route="events.view.speakers.list" @model="all" class="item">
{{t 'All'}}
{{/link-to}}
{{#link-to 'events.view.speakers.list' 'pending' class='item'}}
</LinkTo>
<LinkTo @route="events.view.speakers.list" @model="pending" class="item">
{{t 'Pending'}}
{{/link-to}}
{{#link-to 'events.view.speakers.list' 'accepted' class='item'}}
</LinkTo>
<LinkTo @route="events.view.speakers.list" @model="accepted" class="item">
{{t 'Accepted'}}
{{/link-to}}
{{#link-to 'events.view.speakers.list' 'confirmed' class='item'}}
</LinkTo>
<LinkTo @route="events.view.speakers.list" @model="confirmed" class="item">
{{t 'Confirmed'}}
{{/link-to}}
{{#link-to 'events.view.speakers.list' 'rejected' class='item'}}
</LinkTo>
<LinkTo @route="events.view.speakers.list" @model="rejected" class="item">
{{t 'Rejected'}}
{{/link-to}}
{{/tabbed-navigation}}
</LinkTo>
</TabbedNavigation>
</div>
<div class="ten wide right aligned column">
<div class="ui labeled input">
<button class="ui blue button right-floated {{if isLoading 'loading'}}" {{action 'export'}}>{{t 'Export as CSV'}}</button>
{{#link-to 'events.view.speakers.create' class='ui blue button right floated'}}
<LinkTo @route="events.view.speakers.create" class="ui blue button right floated">
{{t 'Add Speaker'}}
{{/link-to}}
</LinkTo>
</div>
</div>
</div>
Expand Down
Loading