Skip to content

fix: simplify sponsor box #5466

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 18, 2020
Merged

fix: simplify sponsor box #5466

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b0c497
simplify sponsor box
maze-runnar Nov 3, 2020
7083b7c
deleting commented, inline css is for overriding .content css
maze-runnar Nov 4, 2020
5710604
removing inline css, spacing correct, i guees..
maze-runnar Nov 5, 2020
a5070d6
merge conflict
maze-runnar Nov 7, 2020
3b7a357
changes
maze-runnar Nov 7, 2020
6fa3df0
reducing pagination and table distance
maze-runnar Nov 8, 2020
bd334e2
Merge branch 'development' into sponsor-box
mariobehling Nov 10, 2020
6b6aa49
deleting column level, name width increase, finalizing PR
maze-runnar Nov 18, 2020
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
46 changes: 4 additions & 42 deletions app/controllers/events/view/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Controller from '@ember/controller';
import { action } from '@ember/object';
import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-controller';

export default class extends Controller.extend(EmberTableControllerMixin) {
Expand All @@ -15,58 +14,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
name : 'Name',
valuePath : 'name',
headerComponent : 'tables/headers/sort',
isSortable : true
isSortable : true,
width : 150

},
{
name : 'Type',
valuePath : 'type',
cellComponent : 'ui-table/cell/cell-sponsor-sanitize'
cellComponent : 'ui-table/cell/cell-sponsor-sanitize',
width : 150
},
{
name : 'Level',
valuePath : 'level',
cellComponent : 'ui-table/cell/cell-sponsor-sanitize'
},
{
name : 'Options',
valuePath : 'id',
cellComponent : 'ui-table/cell/cell-sponsor-options',
actions : {
editSponsor : this.editSponsor.bind(this),
deleteSponsor : this.deleteSponsor.bind(this)
}
}
];
}

@action
deleteSponsor(sponsor_id) {
this.set('isLoading', true);
const sponsor = this.store.peekRecord('sponsor', sponsor_id, { backgroundReload: false });
sponsor.destroyRecord()
.then(() => {
this.notify.success(this.l10n.t('Sponsor has been deleted successfully.'),
{
id: 'spons_deleted'
});
this.refreshModel.bind(this)();
})
.catch(e => {
console.error('Error while deleting sponsor', e);
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'spons_deleted_error'
});
})
.finally(() => {
this.set('isLoading', false);
});
}

@action
editSponsor() {
this.transitionToRoute('events.view.edit.sponsors');
}
}

39 changes: 21 additions & 18 deletions app/templates/components/events/view/overview/event-sponsors.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
<div class="content">
<div class="content d-flex" style="align-items: center;">
<div class="header">{{t 'Event sponsors'}}</div>
<LinkTo
@route="events.view.edit.sponsors"
@tagName="button" class="ui right floated blue button">
{{t 'Add Sponsors'}}
@tagName="button" class="ui right floated blue button item ml-auto">
{{t 'Edit'}}
</LinkTo>
<div class="header">{{t 'Sponsors'}}</div>
</div>

<div class="content">
<Tables::Default
@columns={{this.columns}}
@rows={{this.data.data}}
@currentPage={{this.page}}
@pageSize={{this.per_page}}
@searchQuery={{this.search}}
@hideSearchBox={{true}}
@sortBy={{this.sort_by}}
@sortDir={{this.sort_dir}}
@metaData={{this.data.meta}}
@filterOptions={{this.filterOptions}}
@widthConstraint="eq-container"
@resizeMode="fluid"
@fillMode="equal-column" />
<div style="width: 95%;margin-left:2.5%">
<Tables::Default
@columns={{this.columns}}
@rows={{this.data.data}}
@currentPage={{this.page}}
@pageSize={{this.per_page}}
@searchQuery={{this.search}}
@hideSearchBox={{true}}
@sortBy={{this.sort_by}}
@sortDir={{this.sort_dir}}
@metaData={{this.data.meta}}
@filterOptions={{this.filterOptions}}
@widthConstraint="eq-container"
@resizeMode="fluid"
@fillMode="equal-column" />
</div>
</div>
4 changes: 2 additions & 2 deletions app/templates/components/tables/default.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
{{/if}}
</div>
<div class="row">
<div class="ui no bottom padding row">
<EmberTable as |t|>
<t.head
@sortFunction={{null}}
Expand Down Expand Up @@ -56,7 +56,7 @@
</EmberTable>
</div>

<div class="row">
<div class="ui no top padding row">
<Tables::Utilities::Pagination
@currentPage={{this.currentPage}}
@pageSize={{this.pageSize}}
Expand Down