Skip to content

Commit

Permalink
Update font awesome assets, bump more deps
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner committed Feb 11, 2021
1 parent 89ccd34 commit d02d5ba
Show file tree
Hide file tree
Showing 18 changed files with 2,155 additions and 3,486 deletions.
24 changes: 24 additions & 0 deletions config/icons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = function() {
return {
'free-brands-svg-icons': [
'facebook',
'github',
'twitter'
],
'free-solid-svg-icons': [
'bell',
'caret-down',
'check-square',
'chevron-down',
'chevron-left',
'chevron-right',
'code',
'envelope',
'sort',
'sort-down',
'sort-up',
'square',
'trash'
]
};
};
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,29 @@
"changelog": "lerna-changelog"
},
"dependencies": {
"@html-next/vertical-collection": "^1.0.0",
"@fortawesome/ember-fontawesome": "^0.2.2",
"@fortawesome/free-brands-svg-icons": "^5.15.2",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@html-next/vertical-collection": "^2.0.0",
"ember-cli-babel": "^7.21.0",
"ember-cli-htmlbars": "^5.2.0",
"ember-cli-string-helpers": "^5.0.0",
"ember-get-config": "^0.2.4",
"ember-in-viewport": "^3.7.2",
"ember-get-config": "^0.3.0",
"ember-in-viewport": "^3.8.1",
"ember-scrollable": "^1.0.2",
"ember-truth-helpers": "^3.0.0",
"ember-wormhole": "^0.6.0"
},
"devDependencies": {
"@ember/jquery": "^1.1.0",
"@ember/optional-features": "^1.3.0",
"@ember/optional-features": "^2.0.0",
"@glimmer/component": "^1.0.3",
"@glimmer/tracking": "^1.0.3",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.6.0",
"ember-auto-import": "^1.10.1",
"ember-cli": "~3.20.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-app-version": "^4.0.0",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-code-coverage": "^1.0.2",
"ember-cli-dependency-checker": "^3.2.0",
Expand All @@ -59,22 +62,20 @@
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-cli-yuidoc": "0.9.1",
"ember-code-snippet": "^3.0.0",
"ember-composable-helpers": "^4.2.2",
"ember-concurrency": "^1.2.1",
"ember-composable-helpers": "^4.4.1",
"ember-concurrency": "^1.3.0",
"ember-data": "^3.16.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-font-awesome": "^4.0.0-rc.4",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-notify-property-change-polyfill": "^0.0.2",
"ember-one-way-controls": "^3.0.1",
"ember-prism": "^0.7.0",
"ember-prism": "0.7.0",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.0",
"ember-responsive": "^4.0.0",
"ember-resolver": "^8.0.2",
"ember-responsive": "^4.0.1",
"ember-source": "~3.20.2",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.9.1",
Expand All @@ -86,8 +87,7 @@
"lerna-changelog": "^1.0.1",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit-dom": "^1.6.0",
"yuidoc-ember-theme": "^2.0.1"
"qunit-dom": "^1.6.0"
},
"engines": {
"node": "10.* || >= 12"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
resizeOnDrag=true
fixed=true
}}
Expand All @@ -24,8 +24,8 @@

{{t.foot
onColumnClick=(action "onColumnClick")
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
resizeOnDrag=true
fixed=true
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(pipe (action "onColumnClick") (action "setPage" 1))
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
) as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/components/responsive-table.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
10 changes: 5 additions & 5 deletions tests/dummy/app/templates/components/rows/selectable-table.hbs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{{!-- BEGIN-SNIPPET selectable-table --}}
<div class="table-actions">
{{#if hasSelection}}
<div class="table-action fa fa-check-square-o" title="Deselect all" {{action "deselectAll"}} role="button"></div>
<div class="table-action fa fa-trash-o delete" title="Delete selected" {{action "deleteAll"}} role="button"></div>
<div class="table-action fa fa-check-square" title="Deselect all" {{action "deselectAll"}} role="button"></div>
<div class="table-action fa fa-trash delete" title="Delete selected" {{action "deleteAll"}} role="button"></div>
{{else}}
<div class="table-action fa fa-square-o" title="Select all" {{action "selectAll"}} role="button"></div>
<div class="table-action fa fa-square" title="Select all" {{action "selectAll"}} role="button"></div>
{{/if}}
</div>

{{#light-table table height="65vh" as |t|}}
{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/components/scrolling-table.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/components/simple-table.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{#light-table table height="65vh" as |t|}}

{{!--
In order for `fa-sort-asc` and `fa-sort-desc` icons to work,
In order for `fa-sort-up` and `fa-sort-down` icons to work,
you need to have ember-font-awesome installed or manually include
the font-awesome assets, e.g. via a CDN.
--}}

{{t.head
onColumnClick=(action "onColumnClick")
iconSortable="fa fa-sort"
iconAscending="fa fa-sort-asc"
iconDescending="fa fa-sort-desc"
iconAscending="fa fa-sort-up"
iconDescending="fa fa-sort-down"
fixed=true
}}

Expand Down
18 changes: 9 additions & 9 deletions tests/integration/components/lt-head-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ module('Integration | Component | lt head', function(hooks) {
this.set('table', Table.create({ columns: Columns }));

await render(
hbs`{{lt-head table=table renderInPlace=true iconSortable='fa-sort' iconAscending='fa-sort-asc' iconDescending='fa-sort-desc'}}`
hbs`{{lt-head table=table renderInPlace=true iconSortable='fa-sort' iconAscending='fa-sort-up' iconDescending='fa-sort-down'}}`
);

const allHeaders = findAll('tr > th');
Expand All @@ -83,22 +83,22 @@ module('Integration | Component | lt head', function(hooks) {

// Sortable case
assert.ok(hasClass(sortIcon, 'fa-sort'), 'Sortable icon renders');
assert.notOk(hasClass(sortIcon, 'fa-sort-asc'));
assert.notOk(hasClass(sortIcon, 'fa-sort-desc'));
assert.notOk(hasClass(sortIcon, 'fa-sort-up'));
assert.notOk(hasClass(sortIcon, 'fa-sort-down'));

await click(sortableHeader);

// Ascending case
assert.ok(hasClass(sortIcon, 'fa-sort-asc'), 'Ascending icon renders');
assert.ok(hasClass(sortIcon, 'fa-sort-up'), 'Ascending icon renders');
assert.notOk(hasClass(sortIcon, 'fa-sort'));
assert.notOk(hasClass(sortIcon, 'fa-sort-desc'));
assert.notOk(hasClass(sortIcon, 'fa-sort-down'));

await click(sortableHeader);

// Descending case
assert.ok(hasClass(sortIcon, 'fa-sort-desc'), 'Descending icon renders');
assert.ok(hasClass(sortIcon, 'fa-sort-down'), 'Descending icon renders');
assert.notOk(hasClass(sortIcon, 'fa-sort'));
assert.notOk(hasClass(sortIcon, 'fa-sort-asc'));
assert.notOk(hasClass(sortIcon, 'fa-sort-up'));
});

test('custom iconComponent has arguments', function(assert) {
Expand All @@ -108,8 +108,8 @@ module('Integration | Component | lt head', function(hooks) {

assert.expect(6 * sortableColumns.length);
const iconSortable = 'unfold_more';
const iconAscending = 'fa-sort-asc';
const iconDescending = 'fa-sort-desc';
const iconAscending = 'fa-sort-up';
const iconDescending = 'fa-sort-down';
const iconComponent = 'custom-icon-component';

this.setProperties({
Expand Down
Loading

0 comments on commit d02d5ba

Please sign in to comment.